Hello community,
here is the log from the commit of package texlive-specs-e for openSUSE:Factory checked in at 2017-06-25 19:21:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-e (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-e.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-e"
Sun Jun 25 19:21:33 2017 rev:27 rq:504794 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.changes 2017-06-08 14:54:17.124844668 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-e.new/texlive-specs-e.changes 2017-06-25 19:24:02.388108808 +0200
@@ -1,0 +2,42 @@
+Mon Jun 19 13:31:54 UTC 2017 - werner@suse.de
+
+- Fix texlive-pdftex-def dependency as now texlive-graphics-def does
+ provide pdftex.def
+- Fix texlive-rotating dependency as now texlive-graphics does
+ provide rotating.sty
+
+-------------------------------------------------------------------
+Fri Jun 16 12:14:49 UTC 2017 - werner@suse.de
+
+- Notive: Some patches have been moved
+ * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c
+ * context_fourier-map.dif from texlive-specs-e to texlive-specs-f
+ * dvips_config.dif from texlive-specs-g to texlive-specs-h
+ * jadetex_ini.dif from texlive-specs-l to texlive-specs-m
+ * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w
+ * texdraw_info.dif from texlive-specs-v to texlive-specs-w
+ this entry exists only to silent the auto factory bot
+
+-------------------------------------------------------------------
+Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de
+
+- Final TeXLive 2017 20170520
+- Remove patch fontspec_emph.dif as now upstream
+- Update patches
+ * kpathsea_cnf.dif
+ * latex2man_tmphandling.dif
+ * latexdiff_perl.dif
+ * latexpand_perl.dif
+ * luaotfload_varfonts.dif
+ * luatex_cnf.dif
+ * musixtex_various.dif
+ * tetex_scripts.dif
+ * tex4ht_env.dif
+ * texconfig_scripts.dif
+
+-------------------------------------------------------------------
+Thu Jun 1 12:29:31 UTC 2017 - werner@suse.de
+
+- Update to TeXLive 2017 20170520 pretest
+
+-------------------------------------------------------------------
Old:
----
concmath-fonts.doc.tar.xz
concmath-fonts.tar.xz
concprog.doc.tar.xz
concprog.tar.xz
concrete.doc.tar.xz
concrete.tar.xz
confproc.doc.tar.xz
confproc.tar.xz
constants.doc.tar.xz
constants.tar.xz
conteq.doc.tar.xz
conteq.tar.xz
context-account.doc.tar.xz
context-account.tar.xz
context-algorithmic.tar.xz
context-animation.doc.tar.xz
context-animation.tar.xz
context-annotation.doc.tar.xz
context-annotation.tar.xz
context-bnf.doc.tar.xz
context-bnf.tar.xz
context-chromato.doc.tar.xz
context-chromato.tar.xz
context-construction-plan.doc.tar.xz
context-construction-plan.tar.xz
context-cyrillicnumbers.doc.tar.xz
context-cyrillicnumbers.tar.xz
context-degrade.doc.tar.xz
context-degrade.tar.xz
context-fancybreak.doc.tar.xz
context-fancybreak.tar.xz
context-filter.doc.tar.xz
context-filter.tar.xz
context-fixme.tar.xz
context-french.doc.tar.xz
context-french.tar.xz
context-fullpage.doc.tar.xz
context-fullpage.tar.xz
context-games.doc.tar.xz
context-games.tar.xz
context-gantt.doc.tar.xz
context-gantt.tar.xz
context-gnuplot.doc.tar.xz
context-gnuplot.tar.xz
context-letter.doc.tar.xz
context-letter.tar.xz
context.doc.tar.xz
context.tar.xz
context_fourier-map.dif
New:
----
changebar.doc.tar.xz
changebar.tar.xz
changelayout.doc.tar.xz
changelayout.tar.xz
changepage.doc.tar.xz
changepage.tar.xz
changes.doc.tar.xz
changes.tar.xz
chappg.doc.tar.xz
chappg.tar.xz
chapterfolder.doc.tar.xz
chapterfolder.tar.xz
charter.doc.tar.xz
charter.tar.xz
chbibref.doc.tar.xz
chbibref.tar.xz
checkcites.doc.tar.xz
checkcites.tar.xz
checklistings.doc.tar.xz
checklistings.tar.xz
chem-journal.tar.xz
chemarrow.doc.tar.xz
chemarrow.tar.xz
chembst.doc.tar.xz
chembst.tar.xz
chemcompounds.doc.tar.xz
chemcompounds.tar.xz
chemcono.doc.tar.xz
chemcono.tar.xz
chemexec.doc.tar.xz
chemexec.tar.xz
chemfig.doc.tar.xz
chemfig.tar.xz
chemformula.doc.tar.xz
chemformula.tar.xz
chemgreek.doc.tar.xz
chemgreek.tar.xz
chemmacros.doc.tar.xz
chemmacros.tar.xz
chemnum.doc.tar.xz
chemnum.tar.xz
chemschemex.doc.tar.xz
chemschemex.tar.xz
chemstyle.doc.tar.xz
chemstyle.tar.xz
cherokee.doc.tar.xz
cherokee.tar.xz
chess-problem-diagrams.doc.tar.xz
chess-problem-diagrams.tar.xz
chess.doc.tar.xz
chess.tar.xz
childdoc.doc.tar.xz
childdoc.tar.xz
cje.doc.tar.xz
cje.tar.xz
combofont.doc.tar.xz
combofont.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-e.spec ++++++
++++ 40408 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-e.new/texlive-specs-e.spec
++++++ chessboard.doc.tar.xz ++++++
++++++ chessboard.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessboard.tlpobj new/tlpkg/tlpobj/chessboard.tlpobj
--- old/tlpkg/tlpobj/chessboard.tlpobj 2016-04-14 18:49:50.000000000 +0200
+++ new/tlpkg/tlpobj/chessboard.tlpobj 2017-04-14 17:34:59.000000000 +0200
@@ -16,7 +16,7 @@
RELOC/tex/latex/chessboard/chessboard-pgf.sty
RELOC/tex/latex/chessboard/chessboard.sty
catalogue-ctan /macros/latex/contrib/chessboard
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics games
catalogue-version 1.7
++++++ chessfss.doc.tar.xz ++++++
++++++ chessfss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessfss.tlpobj new/tlpkg/tlpobj/chessfss.tlpobj
--- old/tlpkg/tlpobj/chessfss.tlpobj 2016-04-14 18:49:50.000000000 +0200
+++ new/tlpkg/tlpobj/chessfss.tlpobj 2017-04-14 17:34:59.000000000 +0200
@@ -45,7 +45,7 @@
RELOC/tex/latex/chessfss/lsiskak.fd
RELOC/tex/latex/chessfss/lsiskaknew.fd
catalogue-ctan /macros/latex/contrib/chessfss
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp games
catalogue-version 1.2a
++++++ chet.doc.tar.xz ++++++
++++++ chet.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chet.tlpobj new/tlpkg/tlpobj/chet.tlpobj
--- old/tlpkg/tlpobj/chet.tlpobj 2016-04-14 18:49:50.000000000 +0200
+++ new/tlpkg/tlpobj/chet.tlpobj 2017-04-14 17:34:59.000000000 +0200
@@ -9,7 +9,7 @@
RELOC/bibtex/bst/chet/chetref.bst
RELOC/tex/latex/chet/chet.sty
catalogue-ctan /macros/latex/contrib/chet
-catalogue-date 2015-08-18 23:28:09 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics layout
catalogue-version 2.1
++++++ chextras.doc.tar.xz ++++++
++++++ chextras.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chextras.tlpobj new/tlpkg/tlpobj/chextras.tlpobj
--- old/tlpkg/tlpobj/chextras.tlpobj 2016-04-14 18:49:50.000000000 +0200
+++ new/tlpkg/tlpobj/chextras.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -19,7 +19,7 @@
RELOC/tex/latex/chextras/t1lmvttos.fd
catalogue-also chletter
catalogue-ctan /macros/latex/contrib/chextras
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics swiss
catalogue-version 1.01
++++++ chicago-annote.doc.tar.xz ++++++
++++++ chicago-annote.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chicago-annote.tlpobj new/tlpkg/tlpobj/chicago-annote.tlpobj
--- old/tlpkg/tlpobj/chicago-annote.tlpobj 2016-04-14 18:49:51.000000000 +0200
+++ new/tlpkg/tlpobj/chicago-annote.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -8,6 +8,6 @@
runfiles size=10
RELOC/bibtex/bst/chicago-annote/chicago-annote.bst
catalogue-ctan /biblio/bibtex/contrib/chicago-annote
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-sty bibtex-annote
++++++ chicago.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chicago.tlpobj new/tlpkg/tlpobj/chicago.tlpobj
--- old/tlpkg/tlpobj/chicago.tlpobj 2016-04-14 18:49:50.000000000 +0200
+++ new/tlpkg/tlpobj/chicago.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -11,6 +11,6 @@
RELOC/bibtex/bst/chicago/chicago.bst
RELOC/tex/latex/chicago/chicago.sty
catalogue-ctan /biblio/bibtex/contrib/chicago
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics bibtex-sty
++++++ chickenize.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/chickenize/README new/doc/luatex/chickenize/README
--- old/doc/luatex/chickenize/README 2015-12-29 01:15:08.000000000 +0100
+++ new/doc/luatex/chickenize/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-This is the README file of the chickenize package. The package provides several commands and Lua functions to manipulate the input or output tokens of any Lua(La)TeX document. It serves mostly educational and playful usage, but some functions may be used in serious documents.
-
-To produce the package files, run lualatex on chickinize.dtx, wich should result in the creation of the following files:
- chickenize.pdf (documentation)
- chickenize.tex (plainTeX user interface)
- chickenize.sty (LaTeX user interface)
- chickenize.lua (Lua package code) [does the actual work]
-
-You need an up-to-date TeX Live (2015, possible) to use this package. Maybe a full MiKTeX will do, too.
-
-For any comments or suggestions, contact me:
-arno dot trautmann at gmx dot de
-
-Hope you have fun with this package!
-
-This package is copyright © 2015 Arno L. Trautmann. It may be distributed and/or
-modified under the conditions of the LaTeX Project Public License, either version 1.3c
-of this license or (at your option) any later version. This work has the LPPL mainten-
-ance status ‘author-maintained’.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/chickenize/README.md new/doc/luatex/chickenize/README.md
--- old/doc/luatex/chickenize/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/luatex/chickenize/README.md 2016-11-25 19:30:33.000000000 +0100
@@ -0,0 +1,19 @@
+The package chickenize provides several commands and Lua functions to manipulate the input or output tokens of any Lua(La)TeX document. It serves mostly educational and playful usage, but some functions may be used in serious documents.
+
+To produce the package files, run lualatex on chickinize.dtx, wich should result in the creation of the following files:
+ chickenize.pdf (documentation)
+ chickenize.tex (plainTeX user interface)
+ chickenize.sty (LaTeX user interface)
+ chickenize.lua (Lua package code) [does the actual work]
+
+You need an up-to-date TeX Live (2016, if possible) to use this package. Maybe a full MiKTeX will will also work. (Not tested!) Lua\TeX > 0.90 is required for some features since the corresponding syntax has changed!
+
+For any comments or suggestions, contact me:
+arno dot trautmann at gmx dot de
+
+Hope you have fun with this package!
+
+This package is copyright © 2016 Arno L. Trautmann. It may be distributed and/or
+modified under the conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version. This work has the LPPL mainten-
+ance status ‘maintained’.
Binary files old/doc/luatex/chickenize/chickenize.pdf and new/doc/luatex/chickenize/chickenize.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.doc.tlpobj new/tlpkg/tlpobj/chickenize.doc.tlpobj
--- old/tlpkg/tlpobj/chickenize.doc.tlpobj 2016-04-14 18:49:51.000000000 +0200
+++ new/tlpkg/tlpobj/chickenize.doc.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -1,8 +1,8 @@
name chickenize.doc
category Package
-revision 39341
+revision 42341
shortdesc doc files of chickenize
relocated 1
-docfiles size=48
- RELOC/doc/luatex/chickenize/README
+docfiles size=49
+ RELOC/doc/luatex/chickenize/README.md
RELOC/doc/luatex/chickenize/chickenize.pdf
++++++ chickenize.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.lua new/tex/luatex/chickenize/chickenize.lua
--- old/tex/luatex/chickenize/chickenize.lua 2016-01-11 01:11:00.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.lua 2016-11-25 19:34:04.000000000 +0100
@@ -13,27 +13,29 @@
-- of this license or (at your option) any later version. This work has the LPPL mainten-
-- ance status ‘maintained’.
-local nodenew = node.new
+local nodeid = node.id
local nodecopy = node.copy
+local nodenew = node.new
local nodetail = node.tail
-local nodeinsertbefore = node.insert_before
-local nodeinsertafter = node.insert_after
+local nodeslide = node.slide
local noderemove = node.remove
-local nodeid = node.id
local nodetraverseid = node.traverse_id
-local nodeslide = node.slide
+local nodeinsertafter = node.insert_after
+local nodeinsertbefore = node.insert_before
Hhead = nodeid("hhead")
RULE = nodeid("rule")
GLUE = nodeid("glue")
WHAT = nodeid("whatsit")
COL = node.subtype("pdf_colorstack")
-PDF_LITERAL = node.subtype("pdf_literal")
+DISC = nodeid("disc")
GLYPH = nodeid("glyph")
GLUE = nodeid("glue")
-PENALTY = nodeid("penalty")
-GLUE_SPEc = nodeid("glue_spec")
+HLIST = nodeid("hlist")
KERN = nodeid("kern")
+PUNCT = nodeid("punct")
+PENALTY = nodeid("penalty")
+PDF_LITERAL = node.subtype("pdf_literal")
color_push = nodenew(WHAT,COL)
color_pop = nodenew(WHAT,COL)
color_push.stack = 0
@@ -52,7 +54,7 @@
local match = unicode.utf8.match
chickenize_ignore_word = false
chickenize_real_stuff = function(i,head)
- while ((i.next.id == GLYPH) or (i.next.id == 11) or (i.next.id == 7) or (i.next.id == 0)) do --find end of a word
+ while ((i.next.id == GLYPH) or (i.next.id == KERN) or (i.next.id == DISC) or (i.next.id == HLIST)) do --find end of a word
i.next = i.next.next
end
@@ -75,10 +77,9 @@
chicken[j].char = s
if match(char,"%s") then
chicken[j] = nodenew(GLUE)
- chicken[j].spec = nodenew(GLUE_SPEC)
- chicken[j].spec.width = space
- chicken[j].spec.shrink = shrink
- chicken[j].spec.stretch = stretch
+ chicken[j].width = space
+ chicken[j].shrink = shrink
+ chicken[j].stretch = stretch
end
j = j+1
end
@@ -115,7 +116,7 @@
end
-- At the end of the word, the ignoring is reset. New chance for everyone.
- if not((i.next.id == GLYPH) or (i.next.id == 7) or (i.next.id == 22) or (i.next.id == 11)) then
+ if not((i.next.id == GLYPH) or (i.next.id == DISC) or (i.next.id == PUNCT) or (i.next.id == KERN)) then
chickenize_ignore_word = false
end
end
@@ -395,13 +396,11 @@
end
return head
end
-local letterspace_glue = nodenew(nodeid"glue")
-local letterspace_spec = nodenew(nodeid"glue_spec")
-local letterspace_pen = nodenew(nodeid"penalty")
-
-letterspace_spec.width = tex.sp"0pt"
-letterspace_spec.stretch = tex.sp"0.05pt"
-letterspace_glue.spec = letterspace_spec
+local letterspace_glue = nodenew(nodeid"glue")
+local letterspace_pen = nodenew(nodeid"penalty")
+
+letterspace_glue.width = tex.sp"0pt"
+letterspace_glue.stretch = tex.sp"0.5pt"
letterspace_pen.penalty = 10000
letterspaceadjust = function(head)
for glyph in nodetraverseid(nodeid"glyph", head) do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.sty new/tex/luatex/chickenize/chickenize.sty
--- old/tex/luatex/chickenize/chickenize.sty 2016-01-11 01:11:00.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.sty 2016-11-25 19:34:04.000000000 +0100
@@ -13,7 +13,7 @@
%% of this license or (at your option) any later version. This work has the LPPL mainten-
%% ance status ‘maintained’.
\ProvidesPackage{chickenize}%
- [2016/01/09 v0.2.3 chickenize package]
+ [2016/05/27 v0.2.4 chickenize package]
\input{chickenize}
\iffalse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.tex new/tex/luatex/chickenize/chickenize.tex
--- old/tex/luatex/chickenize/chickenize.tex 2016-01-11 01:11:00.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.tex 2016-11-25 19:34:04.000000000 +0100
@@ -18,7 +18,7 @@
\bgroup%
\fontspec{Latin Modern Sans}%
A%
- \kern-.37em \raisebox{.7ex}{\scalebox{0.25}{L}}%
+ \kern-.4em \raisebox{.65ex}{\scalebox{0.3}{L}}%
\kern-.0em \raisebox{-0.98ex}{T}%
\egroup%
}
@@ -157,6 +157,23 @@
}
\let\dubstepize\dubstepenize
+\def\explainbackslashes{ %% inspired by xkcd #1638
+ {\tt\noindent
+\textbackslash escape character\\
+\textbackslash\textbackslash line end or escaped escape character in tex.print("")\\
+\textbackslash\textbackslash\textbackslash real, real backslash\\
+\textbackslash\textbackslash\textbackslash\textbackslash line end in tex.print("")\\
+\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash elder backslash \\
+\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash which escapes the screen and enters your brain\\
+\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash so real it transcends time and space \\
+\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash to end all other text\\
+\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash... the true name of Ba'al, the soul-eater}
+}
+
+\def\gameoflife{
+ Your Life Is Tetris. Stop Playing It Like Chess.
+}
+
\def\guttenbergenize{ %% makes only sense when using LaTeX
\AtBeginDocument{
\let\grqq\relax\let\glqq\relax
@@ -255,6 +272,11 @@
\let\nyanize\rainbowcolor
\let\unnyanize\unrainbowcolor
+\def\randomchars{
+ \directlua{luatexbase.add_to_callback("post_linebreak_filter",randomchars,"randomchars")}}
+\def\unrandomchars{
+ \directlua{luatexbase.remove_from_callback("post_linebreak_filter","randomchars")}}
+
\def\randomcolor{
\directlua{luatexbase.add_to_callback("post_linebreak_filter",randomcolor,"randomcolor")}}
\def\unrandomcolor{
@@ -381,40 +403,35 @@
}%
}
\long\def\drawchicken{
-\luadraw{90}{
-kopf = {200,50} % Kopfmitte
-kopf_rad = 20
-
-d = {215,35} % Halsansatz
-e = {230,10} %
-
-korper = {260,-10}
-korper_rad = 40
-
-bein11 = {260,-50}
-bein12 = {250,-70}
-bein13 = {235,-70}
-
-bein21 = {270,-50}
-bein22 = {260,-75}
-bein23 = {245,-75}
-
-schnabel_oben = {185,55}
-schnabel_vorne = {165,45}
-schnabel_unten = {185,35}
-
-flugel_vorne = {260,-10}
-flugel_unten = {280,-40}
-flugel_hinten = {275,-15}
-
-sloppycircle(kopf,kopf_rad)
-sloppyline(d,e)
-sloppycircle(korper,korper_rad)
-sloppyline(bein11,bein12) sloppyline(bein12,bein13)
-sloppyline(bein21,bein22) sloppyline(bein22,bein23)
-sloppyline(schnabel_vorne,schnabel_oben) sloppyline(schnabel_vorne,schnabel_unten)
-sloppyline(flugel_vorne,flugel_unten) sloppyline(flugel_hinten,flugel_unten)
-}
+ \luadraw{90}{
+ chickenhead = {200,50} % chicken head center
+ chickenhead_rad = 20
+
+ neckstart = {215,35} % neck
+ neckstop = {230,10} %
+
+ chickenbody = {260,-10}
+ chickenbody_rad = 40
+ chickenleg = {
+ {{260,-50},{250,-70},{235,-70}},
+ {{270,-50},{260,-75},{245,-75}}
+ }
+
+ beak_top = {185,55}
+ beak_front = {165,45}
+ beak_bottom = {185,35}
+
+ wing_front = {260,-10}
+ wing_bottom = {280,-40}
+ wing_back = {275,-15}
+
+ sloppycircle(chickenhead,chickenhead_rad) sloppyline(neckstart,neckstop)
+ sloppycircle(chickenbody,chickenbody_rad)
+ sloppyline(chickenleg[1][1],chickenleg[1][2]) sloppyline(chickenleg[1][2],chickenleg[1][3])
+ sloppyline(chickenleg[2][1],chickenleg[2][2]) sloppyline(chickenleg[2][2],chickenleg[2][3])
+ sloppyline(beak_front,beak_top) sloppyline(beak_front,beak_bottom)
+ sloppyline(wing_front,wing_bottom) sloppyline(wing_back,wing_bottom)
+ }
}
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.tlpobj new/tlpkg/tlpobj/chickenize.tlpobj
--- old/tlpkg/tlpobj/chickenize.tlpobj 2016-04-14 18:49:51.000000000 +0200
+++ new/tlpkg/tlpobj/chickenize.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -1,6 +1,6 @@
name chickenize
category Package
-revision 39341
+revision 42341
shortdesc Use lua callbacks for "interesting" textual effects
relocated 1
longdesc The package allows manipulations of any LuaTeX document (it is
@@ -15,7 +15,7 @@
RELOC/tex/luatex/chickenize/chickenize.sty
RELOC/tex/luatex/chickenize/chickenize.tex
catalogue-ctan /macros/luatex/generic/chickenize
-catalogue-date 2016-01-10 08:26:51 +0100
+catalogue-date 2016-10-24 19:26:02 +0200
catalogue-license lppl1.3
catalogue-topics typesetting games luatex
-catalogue-version 0.2.3
+catalogue-version 0.2.4
++++++ chivo.doc.tar.xz ++++++
++++++ chivo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chivo.tlpobj new/tlpkg/tlpobj/chivo.tlpobj
--- old/tlpkg/tlpobj/chivo.tlpobj 2016-05-08 03:15:15.000000000 +0200
+++ new/tlpkg/tlpobj/chivo.tlpobj 2017-04-14 17:35:00.000000000 +0200
@@ -165,7 +165,7 @@
RELOC/tex/latex/chivo/T1Chivo-TLF.fd
RELOC/tex/latex/chivo/TS1Chivo-TLF.fd
catalogue-ctan /fonts/chivo
-catalogue-date 2016-05-06 07:19:04 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics font font-sans font-otf font-supp font-type1 font-t1enc
catalogue-version 1.0
++++++ chkfloat.doc.tar.xz ++++++
++++++ chkfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chkfloat.tlpobj new/tlpkg/tlpobj/chkfloat.tlpobj
--- old/tlpkg/tlpobj/chkfloat.tlpobj 2016-04-14 18:49:51.000000000 +0200
+++ new/tlpkg/tlpobj/chkfloat.tlpobj 2017-04-14 17:35:01.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/latex/chkfloat/chkfloat.sty
catalogue-ctan /macros/latex/contrib/chkfloat
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics debug-supp
catalogue-version 0.1
++++++ chktex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/chktex/ChkTeX.pdf and new/texmf-dist/doc/chktex/ChkTeX.pdf differ
Binary files old/texmf-dist/doc/man/man1/chktex.man1.pdf and new/texmf-dist/doc/man/man1/chktex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/chkweb.man1.pdf and new/texmf-dist/doc/man/man1/chkweb.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/deweb.man1.pdf and new/texmf-dist/doc/man/man1/deweb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.doc.tlpobj new/tlpkg/tlpobj/chktex.doc.tlpobj
--- old/tlpkg/tlpobj/chktex.doc.tlpobj 2016-04-27 03:16:35.000000000 +0200
+++ new/tlpkg/tlpobj/chktex.doc.tlpobj 2017-05-04 02:06:58.000000000 +0200
@@ -1,8 +1,8 @@
name chktex.doc
category TLCore
-revision 40768
+revision 44166
shortdesc doc files of chktex
-docfiles size=81
+docfiles size=96
texmf-dist/doc/chktex/ChkTeX.pdf
texmf-dist/doc/man/man1/chktex.1
texmf-dist/doc/man/man1/chktex.man1.pdf
++++++ chktex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/chktex/chktexrc new/texmf-dist/chktex/chktexrc
--- old/texmf-dist/chktex/chktexrc 2015-04-12 18:20:42.000000000 +0200
+++ new/texmf-dist/chktex/chktexrc 2017-04-14 01:32:21.000000000 +0200
@@ -493,6 +493,8 @@
\citet:*[][]{} \citep:*[][]{} \citealt:*{} \citealp:*[]{} \citeauthor:*{}
\Citet:*[][]{} \Citep:*[][]{} \Citealt:*{} \Citealp:*[]{} \Citeauthor:{}
\citetext:{} \citeyear:*{} \citeyearpar:{}
+ # tipa which uses "
+ \textipa:{}
}
#####################################################################
@@ -545,7 +547,7 @@
VerbEnvir
{
verbatim comment listing verbatimtab rawhtml errexam picture texdraw
- filecontents pgfpicture tikzpicture
+ filecontents pgfpicture tikzpicture minted lstlisting IPA
}
#####################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/chktex/deweb.pl new/texmf-dist/scripts/chktex/deweb.pl
--- old/texmf-dist/scripts/chktex/deweb.pl 2012-05-28 20:44:54.000000000 +0200
+++ new/texmf-dist/scripts/chktex/deweb.pl 2017-04-14 01:32:21.000000000 +0200
@@ -26,93 +26,104 @@
#
#
-print STDERR "DeWEB v1.2 - Copyright 1996 Jens T. Berger Thielemann\n";
+print STDERR "DeWEB v1.3 - Copyright 1996 Jens T. Berger Thielemann\n";
undef $/;
-$texmode = 1;
-$_ = <>;
+my @FILES = @ARGV;
+FILE:
+while( my $file = shift @FILES ) {
+
+ my $success = open my $fh, '<', "$file";
+ if ( ! $success ) {
+ print STDERR "Couldn't open file '$file'\n";
+ next FILE;
+ }
+
+ $texmode = 1;
+ $_ = <$fh>;
+
+ while (/\@/) {
+ &out($`);
+ $_ = $';
+
+ if (/^@/) {
+ $_ = $';
+ &out('@');
+ next;
+ }
+
+ if (/^([\s\n])/) {
+ $_ = $';
+ print "\n" if $1 eq "\n";
+ $texmode = 1;
+ next;
+ }
+
+ if (/^[cpd]/i) {
+ $_ = $';
+ $texmode = 0;
+ next;
+ }
+
+ if (/^\,/i) {
+ $_ = $';
+ print '\,';
+ next;
+ }
+
+ if (m!^/!) {
+ $_ = $';
+ print '\\\\';
+ next;
+ }
+
+ if (/^[h\&\|\;\#\+]/i || /^i.*/i) {
+ $_ = $';
+ next;
+ }
+
+ if (/^\*[0-9\*]?((.|\n)*?\.)/) {
+ $_ = $';
+ print $1;
+ $texmode = 1;
+ next;
+ }
+
+ if (/^[<(^.t!]((.|\n)*?)\@\>/i) {
+ $_ = $';
+ print '{'.$1.'}';
+ $texmode = 0;
+ next;
+ }
+
+ if (/^[=]((.|\n)*?)\@\>/) {
+ $_ = $';
+ print &printnl($1);
+ next;
+ }
+
+ if (/^[fsl](\s+\S+\s+\S+)|^\'(.|\n)*?\'|^\[((.|\n)*?)\@\]/i) {
+ $_ = $';
+ print &printnl($+);
+ next;
+ }
-while(/\@/)
-{
- &out($`);
- $_ = $';
-
- if(/^@/) {
- $_ = $';
- &out('@');
- next;
- }
-
- if(/^([\s\n])/) {
- $_ = $';
- print "\n" if $1 eq "\n";
- $texmode = 1;
- next;
- }
-
- if(/^[cpd]/i) {
- $_ = $';
- $texmode = 0;
- next;
- }
-
- if(/^\,/i) {
- $_ = $';
- print '\,';
- next;
- }
-
- if(m!^/!) {
- $_ = $';
- print '\\\\';
- next;
- }
+ @line = split(/\n/, $_, 2);
+ print STDERR "Unknown opcode, ignored. Buffer:\n$line[0]\n";
- if(/^[h\&\|\;\#\+]/i || /^i.*/i) {
- $_ = $';
- next;
}
- if(/^\*[0-9\*]?((.|\n)*?\.)/) {
- $_ = $';
- print $1;
- $texmode = 1;
- next;
- }
-
- if(/^[<(^.t!]((.|\n)*?)\@\>/i) {
- $_ = $';
- print '{'.$1.'}';
- $texmode = 0;
- next;
- }
-
- if(/^[=]((.|\n)*?)\@\>/) {
- $_ = $';
- print &printnl($1);
- next;
- }
-
- if(/^[fsl](\s+\S+\s+\S+)|^\'(.|\n)*?\'|^\[((.|\n)*?)\@\]/i) {
- $_ = $';
- print &printnl($+);
- next;
- }
-
- @line = split(/\n/, $_, 2);
- print STDERR "Unknown opcode, ignored. Buffer:\n$line[0]\n";
+ print $_;
}
-print $_;
-
sub printnl {
my($foo);
- if(defined $_[0]) {
- $foo = $_[0];
- $foo =~ s/.//g;
+ if (defined $_[0]) {
+ $foo = $_[0];
+ $foo =~ s/.//g;
} else {
- $foo = "";
+ $foo = "";
}
$foo;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.tlpobj new/tlpkg/tlpobj/chktex.tlpobj
--- old/tlpkg/tlpobj/chktex.tlpobj 2016-04-27 03:16:36.000000000 +0200
+++ new/tlpkg/tlpobj/chktex.tlpobj 2017-05-04 02:06:59.000000000 +0200
@@ -1,6 +1,6 @@
name chktex
category TLCore
-revision 40768
+revision 44166
shortdesc Check for errors in LaTeX documents
longdesc The program reports typographic and other errors in LaTeX
longdesc documents. Filters are also provided for checking the LaTeX
@@ -11,7 +11,7 @@
texmf-dist/scripts/chktex/chkweb.sh
texmf-dist/scripts/chktex/deweb.pl
catalogue-ctan /support/chktex
-catalogue-date 2015-12-09 07:13:40 +0100
+catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license gpl2
catalogue-topics debug-supp
-catalogue-version 1.7.5
+catalogue-version 1.7.6
++++++ chletter.doc.tar.xz ++++++
++++++ chletter.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chletter.tlpobj new/tlpkg/tlpobj/chletter.tlpobj
--- old/tlpkg/tlpobj/chletter.tlpobj 2016-04-14 18:49:54.000000000 +0200
+++ new/tlpkg/tlpobj/chletter.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=3
RELOC/tex/latex/chletter/chletter.cls
catalogue-ctan /macros/latex/contrib/chletter
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics letter swiss
catalogue-version 2.0
++++++ chngcntr.doc.tar.xz ++++++
++++++ chngcntr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chngcntr.tlpobj new/tlpkg/tlpobj/chngcntr.tlpobj
--- old/tlpkg/tlpobj/chngcntr.tlpobj 2016-04-14 18:49:54.000000000 +0200
+++ new/tlpkg/tlpobj/chngcntr.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/latex/chngcntr/chngcntr.sty
catalogue-ctan /macros/latex/contrib/chngcntr
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics macro-supp counter-mgmt
catalogue-version 1.0a
++++++ chronology.doc.tar.xz ++++++
++++++ chronology.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chronology.tlpobj new/tlpkg/tlpobj/chronology.tlpobj
--- old/tlpkg/tlpobj/chronology.tlpobj 2016-04-14 18:49:55.000000000 +0200
+++ new/tlpkg/tlpobj/chronology.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=1
RELOC/tex/latex/chronology/chronology.sty
catalogue-ctan /macros/latex/contrib/chronology
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics planning calendar
catalogue-version 1.1.1
++++++ chronosys.doc.tar.xz ++++++
++++++ chronosys.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chronosys.tlpobj new/tlpkg/tlpobj/chronosys.tlpobj
--- old/tlpkg/tlpobj/chronosys.tlpobj 2016-04-14 18:49:55.000000000 +0200
+++ new/tlpkg/tlpobj/chronosys.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/generic/chronosys/chronosyschr.tex
RELOC/tex/generic/chronosys/x-chronosys.tex
catalogue-ctan /macros/latex/contrib/chronosys
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics diagram
catalogue-version 1.2
++++++ chscite.doc.tar.xz ++++++
++++++ chscite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chscite.tlpobj new/tlpkg/tlpobj/chscite.tlpobj
--- old/tlpkg/tlpobj/chscite.tlpobj 2016-04-14 18:49:55.000000000 +0200
+++ new/tlpkg/tlpobj/chscite.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/bibtex/bst/chscite/chscite.bst
RELOC/tex/latex/chscite/chscite.sty
catalogue-ctan /macros/latex/contrib/chscite
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics bibtex-supp
catalogue-version 2.9999
++++++ churchslavonic.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/churchslavonic/README new/doc/latex/churchslavonic/README
--- old/doc/latex/churchslavonic/README 2016-05-16 00:16:48.000000000 +0200
+++ new/doc/latex/churchslavonic/README 2016-12-20 00:01:03.000000000 +0100
@@ -8,6 +8,13 @@
Only Unicode input encoding is supported. This package requires use of a modern TeX engine that supports
Unicode, such as XeTeX or LuaTeX.
+Changelog
+---------
+
+v0.2.1 2016.12.18 - gloss file included in CTAN package
+v0.2 2016.10.23 - new macrocommands and docs
+v0.1 2016.05.10 - first draft release
+
Installation
------------
Binary files old/doc/latex/churchslavonic/churchslavonic-en.pdf and new/doc/latex/churchslavonic/churchslavonic-en.pdf differ
Binary files old/doc/latex/churchslavonic/churchslavonic-ru.pdf and new/doc/latex/churchslavonic/churchslavonic-ru.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/churchslavonic/churchslavonic.tex new/doc/latex/churchslavonic/churchslavonic.tex
--- old/doc/latex/churchslavonic/churchslavonic.tex 2016-05-16 00:16:48.000000000 +0200
+++ new/doc/latex/churchslavonic/churchslavonic.tex 2016-11-25 19:28:25.000000000 +0100
@@ -1,7 +1,7 @@
-\newfontfamily\russianfont[Script=Cyrillic,Ligatures=TeX]{Times New Roman}
+\newfontfamily\russianfont[Script=Cyrillic,Ligatures=TeX]{Linux Libertine O}
\newfontfamily\russianfonttt[Ligatures=TeX]{lmmono10-regular.otf}
\newfontfamily\russianfontsf[Ligatures=TeX]{lmsans10-regular.otf}
-\newfontfamily\churchslavonicfont[Script=Cyrillic,Ligatures=TeX,HyphenChar="005F]{PonomarUnicode.otf}
+\newfontfamily\churchslavonicfont[Script=Cyrillic,Ligatures=TeX,HyphenChar=_]{PonomarUnicode.otf}
\usepackage{churchslavonic}
\usepackage{hyperref}
@@ -15,7 +15,7 @@
\cuDefineDateFormat{long}{%
\cuDayName{\cuDOW},
\cuNum{\cuDAY}_гѡ~%
- \cuMonthName{\cuMONTH}~%
+ \cuMonthName{\cuMONTH},~%
лѣ́та ѿ сотворе́нїѧ мі́ра~\cuNum{\cuYEARAM}%
}
%
@@ -29,12 +29,12 @@
\begin{EN}
\title{\pkg{churchslavonic} package --- Church Slavonic Typography in \LaTeX}
-\author{Aleksandr Andreev and Mike Kroutikov\\version~0.1}
+\author{Aleksandr Andreev and Mike Kroutikov\\version~0.2}
\end{EN}
\begin{RU}
\title{Пакет \pkg{churchslavonic} --- верстка церковнославянских текстов в системе \LaTeX}
-\author{Александр Андреев и Михаил Крутиков\\версия~0.1}
+\author{Александр Андреев и Михаил Крутиков\\версия~0.2}
\end{RU}
\date{\today}
@@ -100,8 +100,8 @@
\begin{EN}
\section{How to use the package}
-To use \pkg{churchslavonic} package one needs to include the following declarations into the document
-preamble:
+To use the \pkg{churchslavonic} package one needs to include the following
+declarations into the document preamble:
\end{EN}
\begin{RU}
@@ -116,36 +116,47 @@
\end{verbatim}
\begin{EN}
-After that, use standard \pkg{polyglossia} commands to control current language.
+This makes the Church Slavonic hyphenation patterns immediately available.
+After that, use the standard \pkg{polyglossia} commands to control current language.
+Church Slavonic fonts are provided by the \pkg{fonts-churchslavonic} package,
+which should have been installed automatically when you installed this package.
+See the \pkg{fonts-churchslavonic} documentation for information about fonts.
\end{EN}
\begin{RU}
+Сразу станут доступны церковнославянские шаблоны переноса строки.
После чего переключайтесь между языками стандартными средствами пакета \pkg{polyglossia}.
+Церковнославянские шритфы предоставлены в отдельном пакете \pkg{fonts-churchslavonic},
+который должен был установиться когда вы установили этот пакет.
+Подробности о шрифтах смотрите в документации к пакету \pkg{fonts-churchslavonic}.
\end{RU}
\begin{EN}
-\subsection{Options \texttt{color}, \texttt{gray}, and \texttt{bw}}
-These options control what color actually being used for text coloring commands like \cs{cuKinovar}.
+\subsection{Options \texttt{color}, \texttt{gray} (= \texttt{grey}), and \texttt{bw}}
+These options control what color is actually being used for text coloring commands like \cs{cuKinovar}.
\begin{itemize}
-\item \texttt{color} this is the default option and it preserves the original color (a shade of red).
-\item \texttt{gray} replaces red color with a gray - useful if you are printing on a media that
- does not support colors, but is capable of reproduction shades of gray.
-\item \texttt{bw} replaces red color with black (effectively turning off commands like \cs{cuKinovar} and \cs{cuKinovarColor}). Use
- this option to generate document that will be printed in blank-and-white.
+\item \texttt{color} this is the default option; it indicates the original color (a shade of red).
+\item \texttt{gray} (\texttt{grey}) replaces the red color with gray - useful if you are printing on media that
+ does not support color, but is capable of grayscale.
+\item \texttt{bw} replaces the red color with black (effectively turning off
+commands like \cs{cuKinovar} and \cs{cuKinovarColor}). Use
+ this option to generate a document that will be printed in black-and-white.
\end{itemize}
Example:
\end{EN}
\begin{RU}
-\subsection{Опции \texttt{color}, \texttt{gray} и \texttt{bw}}
-Опции позволяют отключать цвет раскраски текста в командах типа \cs{cuKinovar}. Полезны для создания версий для печати на
-устройствах которые не поддерживают цветности.
+\subsection{Опции \texttt{color}, \texttt{gray} (= \texttt{grey}) и \texttt{bw}}
+Опции позволяют отключать цвет раскраски текста в командах типа \cs{cuKinovar}.
+Полезны для создания версий для печати на
+устройствах, которые не поддерживают цветности.
\begin{itemize}
-\item \texttt{color} эта опция используется по умолчанию и означает что используется нормальный красный цвет.
-\item \texttt{gray} заменяет красный цвет серым --- используйте эту опцию если ваше устройство печати не
- поддерживает цветности, но может качественно передавать градации серого цвета.
+\item \texttt{color} эта опция используется по умолчанию и означает,
+что используется нормальный красный цвет.
+\item \texttt{gray} (\texttt{grey}) заменяет красный цвет серым --- используйте эту опцию если
+ваше устройство печати не поддерживает цветности, но может качественно передавать градации серого цвета.
\item \texttt{bw} отключает всякую раскраску --- используйте для создания черно-белой версии документа.
\end{itemize}
Пример:
@@ -156,31 +167,92 @@
\end{verbatim}
\begin{EN}
+\subsection{Underscore}
+The underscore symbol (\texttt{\textunderscore}, U+005F \textsc{Low Line})
+ is a valid text symbol in Church Slavonic (it has roughly the same role
+as the hyphen in English). The package \pkg{churchslavonic} redefines the
+underscore in a way that it can be directly entered in text mode, for example:
+\end{EN}
+%
+\begin{RU}
+\subsection{Знак подчеркивания}
+Знак подчеркивания (\texttt{\textunderscore}, U+005F \textsc{Low Line}))
+в церковнославянском языке играет примерно ту же роль, что и дефис в русском.
+Пакет \pkg{churchslavonic} переопределяет знак подчеркивания так, что его можно
+набирать и в текстовой моде, например:
+\end{RU}
+%
+\begin{center}
+\begin{churchslavonic}
+\begin{tabular}{l}
+Послѣ́дованїе моле́бнагѡ пѣ́нїѧ ст҃ы̑мъ мч҃камъ к҃_гѡ вѣ́ка, \\
+въ Са́нктъ_Петербꙋ́ржстѣй дꙋхо́внѣй а҆каде́мїи \\
+нача̑льствовавшимъ, ᲂу҆чи̑вшимъ и҆ ᲂу҆чи̑вшимсѧ \\
+\end{tabular}
+\end{churchslavonic}
+\end{center}
+
+\begin{EN}
+\cuKinovar{Attention:} if you have an older version of the \pkg{fontspec} package installed on your system,
+the redefined underscore symbol cannot be used in font names and font options in \pkg{fontspec} commands like
+\cs{setXXXfont} and \cs{newfontfamily}.
+
+Typically you need to set underscore as the hyphenation character for Church Slavonic fonts: \texttt{HyphenChar=_}.
+With older versions of \pkg{fontspec} this will cause errors. This problem exists in \TeX\ \texttt{Live 2013} and in \pkg{fontspec v2.3c}.
+
+We recommend upgrading your \TeX\ distribution to at least \TeX\ \texttt{Live 2015}. Alternatively you can selectively
+upgrade the \pkg{fontspec} package to version \texttt{v2.4c} or better.
+
+If upgrading is not an option, you can work around this problem by either specifying the hexadecimal code for the hyphenation
+character: \texttt{HyphenChar="005F}, or by declaring all fonts before loading \pkg{churchslavonic}.
+\end{EN}
+
+\begin{RU}
+\cuKinovar{Внимание:} если у вас установлена старая версия пакета \pkg{fontspec},
+переопределенный знак подчеркивания нельзя использовать при задании имен и параметров шрифтов в командах \pkg{fontspec} типа
+\cs{setXXXfont} и \cs{newfontfamily}.
+
+Обычно для церковнославянских шрифтов требуется установить подчеркивание как символ переноса, указав параметр:
+\texttt{HyphenChar=_}. Старые версии \pkg{fontspec} выдадут ошибку.
+Эта проблема присутствует в \TeX\ \texttt{Live 2013} и в \pkg{fontspec v2.3c}.
+
+Мы рекомендуем обновить систему \TeX\ до \TeX\ \texttt{Live 2015} или свежее.
+Или же обновить только пакет \pkg{fontspec} до
+версии \texttt{2.4c} или более новой.
+
+Если же вы не можете установить обновления, то можно
+обойти проблему, указав символ переноса как код в шестнадцатиричном представлении:
+\texttt{HyphenChar="005F}. Другой подход --- это декларировать все шрифты до загрузки пакета \pkg{churchslavonic}.
+\end{RU}
+
+\begin{EN}
\section{Numbers}
-Church Slavonic numbering system is heavily based on the Old Greek one and uses
-letters as digits.
-For more information on the matter, see the appropriate section in \cite{UN41}.
+The Church Slavonic numbering system (Cyrillic numerals)
+is based on Greek Ionian numerals and uses letters as digits.
+For more information on the implementation, consult the appropriate section of \cite{UN41}.
\end{EN}
\begin{RU}
\section{Числа}
-Способ записи чисел в церковнославянском языке основывается на древнегреческом и в
-качестве цифр использует буквы. За подробностями отсылаем интересующегося читателя к
+Способ записи чисел в церковнославянском языке (кириллическая цифирь)
+основывается на древнегреческом и в
+качестве цифр использует буквы.
+За подробностями отсылаем интересующегося читателя к
соответствующей главе \cite{UN41}.
\end{RU}
\begin{EN}
\subsection{\cs{cuNum}}
-Use this command to typeset a Church Slavonic number.
-The command takes a single argument that should expand to a number (register name works too).
+Use this command to typeset a Cyrillic numeral.
+The command takes a single argument that should expand to a number.
\end{EN}
\begin{RU}
\subsection{\cs{cuNum}}
-Команда печатает число в церковнослявянской нотации.
-Она принимает единственный аргумент. Аргументом может быть текст, командная последовательность, или имя
-целочисленного регистра. Единственное условие --- аргумент должен раскрыться в число.
+Команда печатает число кириллической цифирью.
+Она принимает единственный аргумент. Аргументом может быть текст или
+командная последовательность. Единственное условие --- аргумент должен раскрыться в число.
\end{RU}
\begin{center}
@@ -218,7 +290,7 @@
\begin{tabular}[]{ | l | l | }
\hline
\verb+\cuDate{2016-4-21}+ & \cuDate{2016-4-21} \\
-\verb+\cuJulianDate{2016-4-21}+ & \cuJulianDate{2016-4-21} \\
+\verb+\cuDateJulian{2016-4-21}+ & \cuDateJulian{2016-4-21} \\
\verb+\cuDate{\cuToday}+ & \cuDate{\cuToday} \\
\hline
\end{tabular}
@@ -227,22 +299,27 @@
\begin{EN}
\subsection{\cs{cuDate}}
-Command formats the date (according to the current format). Argument is a triplet of numbers \texttt{YYYY-MM-DD} specifying
-the date. Output will be something like this: \textchurchslavonic{\cuDate{2016-04-22}}.
+This command formats the date (according to the current format).
+The argument is a triplet of numbers \texttt{YYYY-MM-DD} specifying
+the date. The output will be something like this: \textchurchslavonic{\cuDate{2016-04-22}}.
Note that \texttt{YYYY-MM-DD} values are not being normalized or interpreted in any way. Thus, it is totally fine to
call \verb+\cuDate{2016-4-32}+ even though April 32 is not a valid date. It will be formatted and printed as April 32. This
-makes it possible to use this macro in a phrase like ``date \verb+\cuDate{2016-4-32}+ is not a valid date in any calendar''.
+makes it possible to use this macro in a phrase like ``the date \verb+\cuDate{2016-4-32}+ is not a valid date in any calendar''.
However, if your date format uses \cs{cuDOW} (day of the week) or \cs{cuYEARAM} (year Anno Mundi), the later quantities are computed by
-interpreting date as a Gregorian calendar date. Also, if input date is not a valid date, it will be normalized via extrapolation.
-For example, April 32nd will be interpreted as May 2nd for the purpose of determining values of the day of the week and year Anno Mundi.
+interpreting the date as a Gregorian calendar date. In this case, if the input date is not a valid date, it will be normalized via extrapolation.
+For example, April 32 will be interpreted as May 2 for the purpose of determining values of the day of the week and year Anno Mundi.
-If your format uses \cs{cuDOW} or \cs{cuYEARAM}, and your date is Julian, not Gregorian, you must use \cs{cuJulianDate} to
+If your format uses \cs{cuDOW} or \cs{cuYEARAM}, and you specify a date according to the Julian, not Gregorian, calendar, you must use \cs{cuDateJulian} to
correctly format days of the week and year Anno Mundi.
-The best practice is to always use \cs{cuDate} with Gregorian dates and use \cs{cuJulianDate} with Julian dates regardless
-of the current date format. This way you can later on switch date formatting style without worrying about getting wrong output.
+The best practice is to always use \cs{cuDate} with Gregorian calendar dates and use \cs{cuDateJulian} with Julian calendar dates regardless
+of the current date format. This way you can switch the date formatting style without worrying about getting the wrong output.
+
+\subsection{\cs{cuDateJulian}}
+Formats the date, just like \cs{cuDate} does, but the argument is interpreted as a date on the Julian calendar (``old style'') instead of the Gregorian calendar.
+This makes a difference only if your format is using symbolic names \cs{cuDOW} and/or \cs{cuYEARAM}.
\end{EN}
\begin{RU}
@@ -251,32 +328,38 @@
Команда форматирует дату (в соответствии с текущим форматом). Аргумент должен иметь вид \texttt{YYYY-MM-DD}. Результат
может выглядеть примерно так: \textchurchslavonic{\cuDate{2016-04-22}}.
-Отметим что значение даты никоем образом не интерпретируется и не нормализируется. Поэтому можно вызывать макрокоманду и с
-невозможными датами, нпример 32-е апреля --- така дата будет отформатирована как 32-е апреля. Так что команду \cs{cuDate} можно
-использовать для набора фраз вроде ``дата \verb+\cuDate{2016-04-22}+ не существует ни в одном календаре''.
+Отметим, что значение даты никоем образом не интерпретируется и не нормализируется. Поэтому можно вызывать макрокоманду и с
+невозможными датами, например 32 апреля --- такая дата будет отформатирована как 32 апреля. Так что команду \cs{cuDate} можно
+использовать для набора фраз вроде ``дата \verb+\cuDate{2016-04-32}+ не существует ни в одном календаре''.
Однако, если вы используете свой формат даты и в этом формате задействованы символические переменные \cs{cuDOW} (день недели)
-или \cs{cuYEARAM} (год от сотворения мира), то значения этих переменных будут вычислены исходя из даты --- и дата интерпретируется
-как дата грегорианского календаря. Кроме того, невозможные даты будут нормализованы методом экстраполяции. Например, 32 апреля
+или \cs{cuYEARAM} (год от сотворения мира), то значения этих переменных будут вычислены исходя из заданной даты --- и дата интерпретируется
+как дата по григорианскому календарю (<<новому стилю>>). В этом случае, невозможные даты будут нормализованы методом экстраполяции. Например, 32 апреля
будет интерпретировано как 2 мая для целей определения дня недели и года от сотворения мира.
-Если ваш формат использует день недели (\cs{cuDOW}) или год от сотворения мира (\cs{cuYEARAM}) и вы указываете дату юлианского календаря,
-вы должны вместо \cs{cuDate} пользоваться макрокомандой \cs{cuJulianDate} для правильной обработки дня недели и года от сотворения мира.
+Если ваш формат использует день недели (\cs{cuDOW}) или год от сотворения мира (\cs{cuYEARAM}), и вы указываете дату по юлианскому календарю (<<старому стилю>>),
+вы должны вместо \cs{cuDate} пользоваться макрокомандой \cs{cuDateJulian} для правильной обработки дня недели и года от сотворения мира.
-Лучше всего всегда использовать \cs{cuDate} для форматирования грегорианских дат и всегда использовать \cs{cuJulianDate} для
-форматирования юлианских дат --- вне зависимости от значения текущего формата. Таким образом вы можете впоследствии изменить
+Лучше всего всегда использовать \cs{cuDate} для форматирования дат по григорианскому календарю и всегда использовать \cs{cuDateJulian} для
+форматирования дат по юлианскому календарю --- вне зависимости от значения текущего формата. Таким образом вы можете впоследствии изменить
формат даты (например, добавив в него день недели) и результат останется правильным.
+
+\subsection{\cs{cuDateJulian}}
+Форматирует дату в соответствии с текущим форматом подобно команде \cs{cuDate}. Отличие заключается в том, что аргумент
+интерпретируется как дата по юлианскому, а не григорианскому календарю. Это имеет значение только если текущий формат даты
+использует символические имена \cs{cuDOW} (день недели) или \cs{cuYEARAM} (год от сотворения мира).
\end{RU}
\begin{EN}
\subsection{\cs{cuDefineDateFormat}}
-Command allows one to define date format. It does not change how \cs{cuDate} formats its output (for that, use \cs{cuUseDateFormat}).
+This command allows you to define your own date format.
+It does not change how \cs{cuDate} formats its output (for that, use \cs{cuUseDateFormat}).
Example:
\end{EN}
\begin{RU}
\subsection{\cs{cuDefineDateFormat}}
-Команда определяет формат даты. Она никак не влияет на то как \cs{cuDate} форматирует свой вывод (для этого используется \cs{cuUseDateFormat}).
+Команда определяет формат даты. Она никак не влияет на то, как \cs{cuDate} форматирует свой вывод (для этого используется \cs{cuUseDateFormat}).
Пример:
\end{RU}
@@ -286,7 +369,7 @@
\verb+\cuDefineDateFormat{long}{%+\\
\verb+ \cuDayName{\cuDOW},+\\
\verb+ \cuNum{\cuDAY}+_гѡ\verb+~%+\\
-\verb+ \cuMonthName{\cuMONTH}~%+\\
+\verb+ \cuMonthName{\cuMONTH},~%+\\
\verb+ +лѣ́та ѿ сотворе́нїѧ мі́ра\verb+~%+\\
\verb+ \cuNum{\cuYEARAM}%+\\
\verb+}+\\
@@ -305,56 +388,51 @@
\end{RU}
\begin{EN}
-Following symbolic names can be used when formatting the date:
+The following symbolic names can be used when formatting the date:
\begin{itemize}
-\item \cs{cuYEAR} --- year part of date (number, like \texttt{2016})
-\item \cs{cuYEARAM}\footnotemark[1] --- year since world creation, aka Anno Mundi (number, like \texttt{7525})
-\item \cs{cuMONTH} --- month part of date (number from 1 to 12)
-\item \cs{cuDAY} --- day of the month
-\item \cs{cuDOW}\footnotemark[1] --- day of the week (number from 0 to 6, where 0 means ``Sunday'')
-\item \cs{cuINDICTION} --- indiction year (number from 1 to 15)
+\item \cs{cuYEAR} --- the year part of a date (a number, like \texttt{2016})
+\item \cs{cuYEARAM}\footnotemark[1] --- the year Anno Mundi, that is, since the creation of the world accoding to the Byzantine reckoning (aka ``the Byzantine era''; a number, like \texttt{7525})
+\item \cs{cuMONTH} --- the month part of a date (a number from 1 to 12, with January set to 1)
+\item \cs{cuDAY} --- the day of the month
+\item \cs{cuDOW}\footnotemark[1] --- the day of the week (number from 0 to 6, where 0 means ``Sunday'')
+\footnotetext[1]{If your format uses this value, make sure that you format the date with the correct macro:
+ you must use \cs{cuDate} for dates on the Gregorian calendar and
+ \cs{cuDateJulian} for dates on the Julian calendar.}
+\footnotetext[2]{See \url{https://en.wikipedia.org/wiki/Indiction}.}
+\item \cs{cuINDICTION} --- the indiction\footnotemark[2] (a number from 1 to 15)
\end{itemize}
-\footnotetext[1]{If your format uses this value, make sure that you format date with a correct macro: you must use
-\cs{cuDate} if passed date is Gregorian, or \cs{cuJulianDate} if you pass Julian date.}
+
\end{EN}
\begin{RU}
При определении формата можно пользоваться следующими символическими именами:
\begin{itemize}
\item \cs{cuYEAR} --- год (число, например \texttt{2016})
-\item \cs{cuYEARAM}\footnotemark[1] --- год от сотворения мира, Anno Mundi (число, например \texttt{7525}).
-\item \cs{cuMONTH} --- месяц (число от 1 до 12)
+\item \cs{cuYEARAM}\footnotemark[1] --- год от сотворения мира по византийскому летоисчеслению (число, например \texttt{7525}).
+\item \cs{cuMONTH} --- месяц (число от 1 до 12, где 1 означает ``январь'')
\item \cs{cuDAY} --- день месяца
-\item \cs{cuDOW}\footnotemark[1] --- день недели (число от 0 to 6, где 0 означает ``воскресение'')
-\item \cs{cuINDICTION} --- индикт (число от 1 до 15)
-\end{itemize}
+\item \cs{cuDOW}\footnotemark[1] --- день недели (число от 0 to 6, где 0 означает ``воскресенье'')
+\item \cs{cuINDICTION} --- индикт\footnotemark[2] (число от 1 до 15)
\footnotetext[1]{Если ваш формат
пользуется этим значением, вы должны форматировать дату правильной макрокомандой: \cs{cuDate}
- если вы передаете дату грегорианского календаря, или \cs{cuJulianDate} если используется дата юлианского календаря}
+ для дат по григорианскому календарю и \cs{cuDateJulian} для дат по юлианскому календарю.}
+\footnotetext[2]{См.~\url{https://ru.wikipedia.org/wiki/\%D0\%98\%D0\%BD\%D0\%B4\%D0\%B8\%D0\%BA\%D1\%82}}
+\end{itemize}
\end{RU}
\begin{EN}
\subsection{\cs{cuUseDateFormat}}
-This command sets the date format to be used by the subsequent \cs{cuDate} and \cs{cuJulianDate}.
-
-\subsection{\cs{cuJulianDate}}
-Formats date, just like \cs{cuDate} does, but argument is interpreted as a Julian calendar date, not a Gregorian calendar one.
-This makes difference only if your format is using symbolic names \cs{cuDOW} and/or \cs{cuYEARAM}.
+This command sets the date format to be used by the subsequent \cs{cuDate} and \cs{cuDateJulian}.
\subsection{\cs{cuMonthName}}
-Command expands numeric argument (month number) into textual representation. It is typically used when defining date format.
-For example, date format named \texttt{default} is defined as:
+This command expands a numeric argument (month number) into textual representation. It is typically used when defining a date format.
+For example, a date format named \texttt{default} is defined as:
\end{EN}
\begin{RU}
\subsection{\cs{cuUseDateFormat}}
Макро устанавливает имя текущего формата даты. Этот формат будет использоваться при последующих вызовах макрокоманд
-\cs{cuDate} и \cs{cuJulianDate}.
-
-\subsection{\cs{cuJulianDate}}
-Форматирует дату в соответствии с текущим форматом подобно команде \cs{cuDate}. Отличие заключается в том, что аргумент
-интерпретируется как дата юлианского а не грегорианского календаря. Это имеет значение только если текущий формат даты
-использует символические имена \cs{cuDOW} (день недели) или \cs{cuYEARAM} (год от сотворения мира).
+\cs{cuDate} и \cs{cuDateJulian}.
\subsection{\cs{cuMonthName}}
Команда раскрывает числовой аргумент в текстовое представление месяца. Команда обычно используется при задании формата
@@ -365,7 +443,7 @@
\begin{churchslavonic}
\begin{tabular}{l}
\verb+\cuDefineDateFormat{default}{%+\\
-\verb+ \cuNum{\cuDAY}~\cuMonthName{\cuMONTH}%+\\
+\verb+ \cuNum{\cuDAY}~\cuMonthName{\cuMONTH},%+\\
\verb+ ~+лѣ́та\verb+~\cuNum{\cuYEAR}%+\\
\verb+}%+\\
\end{tabular}
@@ -374,26 +452,26 @@
\begin{EN}
\subsection{\cs{cuDayName}}
-Expands numeric argument into a textual representation of the day of the week using nominative case.
+Expands a numeric argument into a textual representation of the day of the week in the nominative case.
\subsection{\cs{cuDayNameAccusative}}
-Expands numeric argument into a textual representation of the day of the week using accusative case.
+Expands a numeric argument into a textual representation of the day of the week in the accusative case.
\subsection{\cs{cuToday}}
-This macro expands to a triplet \texttt{YYYY-MM-DD}. Date is generated using Gregorian calendar.
+This macro expands to a triplet \texttt{YYYY-MM-DD}. The date is generated according to the Gregorian calendar.
-\subsection{\cs{cuJulianToday}}
-This macro expands to a triplet \texttt{YYYY-MM-DD}. Date is generated using Julian calendar.
+\subsection{\cs{cuTodayJulian}}
+This macro expands to a triplet \texttt{YYYY-MM-DD}. The date is generated according to the Julian calendar.
It is a shortcut for \verb+\cuAsJulian{\cuToday}+.
\subsection{\cs{cuAsJulian}}
-Converts Gregorian date to Julian date. Input and output use numeric triplet format \texttt{YYYY-MM-DD}.
+Converts a date on the Gregorian calendar to a date on the Julian calendar. Input and output use numeric triplet format \texttt{YYYY-MM-DD}.
-Useful when the same date needs to be formatted as Gregorian and as Julian date.
+Useful when the same date needs to be formatted both according to the Gregorian and Julian calendars.
\subsection{\cs{cuAsGegorian}}
-Converts Julian date to Gregorian date. Input and output use numeric triplet format \texttt{YYYY-MM-DD}.
+Converts a date according to the Julian calendar to a date according to the Gregorian calendar. Input and output use numeric triplet format \texttt{YYYY-MM-DD}.
\end{EN}
@@ -405,38 +483,43 @@
Команда раскрывает числовой аргумент в текстовое представление дня недели в винительном падеже.
\subsection{\cs{cuToday}}
-Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Используется грегорианский календарь.
+Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Дата выводится по григорианскиму календарю (<<новому стилю>>).
-\subsection{\cs{cuJulianToday}}
-Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Используется юлианский календарь.
+\subsection{\cs{cuTodayJulian}}
+Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Дата выводится по юлианскиму календарю (<<старому стилю>>).
-Команда просто ракрывается в: \verb+\cuAsJulian{\cuToday}+.
+Команда просто раскрывается в: \verb+\cuAsJulian{\cuToday}+.
\subsection{\cs{cuAsJulian}}
-Преобразует грегорианскую дату в юлианскую. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}.
+Преобразует дату по григорианскому календарю в дату по юлианскому календарю.
+Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}.
-Команда полезна когда одну и ту же дату надо представить и в грегорианском и в юлианском календаре.
+Команда полезна, когда одну и ту же дату надо написать и по григорианскому, и по юлианскому календарю.
\subsection{\cs{cuAsGregorian}}
-Преобразует юлианскую дату в грегорианскую. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}.
+Преобразует дату по юлианскому календарю в дату по григорианскому календарю. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}.
\end{RU}
\begin{EN}
\section{Kinovar}
-Printed and hand-written Church Slavonic texts often use color to highlight sectional and paragraph structure. Typical style
-would use red color to write section names, comments, marginal notes. First letter of each paragraph is also colored red.
+Printed and hand-written Church Slavonic texts often use color to highlight sectional
+and paragraph structure and to indicate liturgical rubrics, section names, comments,
+and marginal notes. The first letter of each paragraph is also often colored red.
\subsection{\cs{cuKinovar}}
-Takes a single argument and prints it using red color. For example, explicitly specifying its argument one gets expected result:
+Takes a single argument and prints it using red color.
+For example, explicitly specifying its argument one gets the expected result:
\end{EN}
\begin{RU}
\section{Киноварь}
-Печатные и рукописные книги на церковнославянском часто пользуются красным цветом для выделения структурных элементов текста.
-Обычно заголовки, замечания и пометки на полях печатаются красным цветом. Кроме того, первая буква каждого параграфа тоже
-выделяется красным цветом.
+Печатные и рукописные книги на церковнославянском языке часто пользуются
+красным цветом (<<киноварью>>) для выделения структурных элементов текста.
+Обычно богослужебные указания (<<рубрики>>), заголовки, замечания и пометы
+на полях печатаются красным цветом. Кроме того, первая буква каждого параграфа тоже
+часто выделяется красным цветом.
\subsection{\cs{cuKinovar}}
Команда печатает свой аргумент красным цветом. Например, если мы явно зададим текст аргумента, то получим ожидаемый результат:
@@ -453,23 +536,26 @@
\end{center}
\begin{EN}
-If one uses \TeX\ mechanism of implicit argument detection, then, red color will be used for the first character of the
-text after this command. Non-trivial feature of this command is that it will also ``collect'' all diacritical marks that
-belong to this first character, and thus all accents will also use the red color!
-Use this command in the indirect parameter mode to paint red the first letter of each paragraph.\footnote{You can also experiment
-with \TeX\ command \cs{everypar} to autoamte this, but the success or failure of this technique critically depends on the
-\LaTeX\ class used and packages loaded. We found it very fragile and thus \pkg{churchslavonic} package does not offer
-any automation for this. It may be easier and more robust use Search/Replace functionality embedded in any non-trivial text
-editor to just automatically place \cs{cuKinovar} command before every paragraph of the source text.}
+If one uses the \TeX\ mechanism of implicit argument detection,
+then the first character of the text after this command will be printed in red.
+However, a non-trivial feature of this command is that it will also ``collect'' all
+of the diacritical marks that belong to this first character,
+and thus all accents will also be colored in red!
+Use this command in the indirect parameter mode to print in red the first letter
+of each paragraph.\footnote{You can also experiment
+with the \TeX\ command \cs{everypar} to automate this, but the success or failure of this technique critically depends on the
+\LaTeX\ class used and packages loaded. We found it very fragile and thus the \pkg{churchslavonic} package does not offer
+any automation for this task. It may be easier and more robust to use the Find/Replace functionality embedded in any non-trivial text
+editor to just automatically place a \cs{cuKinovar} command before every paragraph of the source text.}
\end{EN}
\begin{RU}
Если же используется механизм \TeX{} неявного задания аргумента, то команда будет применена к первой букве последующего текста.
-При этом команда ``соберет'' все необходимые выносные символы, так что все акценты первой буквы будут корректно раскрашены!
+При этом команда ``соберет'' все необходимые выносные символы, так что все надстрочные знаки первой буквы будут также корректно раскрашены!
Поэтому очень удобно использовать эту команду с неявным заданием аргумента для раскраски первой буквы параграфа.\footnote{Вы также
можете поэкспериментировать со встроенной командой \TeX\ \cs{everypar} с целью полностью автоматизировать раскраску первой буквы
-параграфа. Однако успех сильно зависит от того какой класс системы \LaTeX\ используется и от того какие пакеты подгружаются.
-Мы не нашли надежного способа заставить \cs{everypar} работать и поэтому пакет \pkg{churchslavonic} не предлагает никаких
+каждого параграфа. Однако успех сильно зависит от того, какой класс системы \LaTeX\ используется и от того, какие пакеты подгружаются.
+Мы не нашли надежного способа заставить \cs{everypar} работать, и поэтому пакет \pkg{churchslavonic} не предлагает никаких
макрокоманд для дальнейшей автоматизации этого процесса. На практике, часто проще и надежнее воспользоваться функцией
текстового редактора Найти/Заменить для вставки макрокоманды \cs{cuKinovar} перед каждым параграфом.}
\end{RU}
@@ -489,34 +575,140 @@
\begin{EN}
\subsection{\cs{cuKinovarColor}}
-Switches current color to red. One would typically use this command inside a group that limits the scope of red text, unless
+Switches the current color to red. One would typically use this command
+inside a group that limits the scope of red text, unless
you want all subsequent text to be colored red.
\end{EN}
\begin{RU}
\subsection{\cs{cuKinovarColor}}
-Команда переключает текущий цвет на красный. Должна использоваться внутри группы, которая ограничит ее действие (если вы не хотите
-чтобы весь послеующий текст был напечатан красным цветом).
+Команда переключает текущий цвет на красный. Должна использоваться
+внутри группы, которая ограничит ее действие (если вы не хотите
+чтобы весь последующий текст был напечатан красным цветом).
+\end{RU}
+
+\begin{EN}
+\section{Miscellaneous}
+\subsection{\cs{cuMarginMark}, \cs{cuMarginMarkSkip}, \& \cs{cuMarginMarkText}}
+The command \cs{cuMarginMark} is used to place short text in the margin
+at the same level as the line where the macro is placed.
+Example:
+\end{EN}
+%
+\begin{RU}
+\section{Разное}
+\subsection{\cs{cuMarginMark}, \cs{cuMarginMarkSkip} и \cs{cuMarginMarkText}}
+Команда \cs{cuMarginMark} используется для печати значков на полях,
+напротив строки, где вызвана эта команда.
+Например:
+\end{RU}
+%
+\begin{center}
+\begin{churchslavonic}
+\begin{tabular}{l}
+ \verb+\cuMarginMark{+в҃\verb+}\cuKinovar+ Бл҃гословѝ дꙋшѐ моѧ̀ гдⷭ҇а и҆ не забыва́й\\
+ всѣ́хъ воздаѧ́нїй є҆гѡ̀. \verb+\cuMarginMark{+а҃\verb+}\cuKinovar+ Ѡ҆чища́ющаго \\
+ всѧ̑ беззакѡ́нїѧ твоѧ̑, и҆сцѣлѧ́ющаго всѧ̑ недꙋ́ги твоѧ̑: \\
+ \verb+\cuMarginMark{+в҃\verb+}\cuKinovar+ И҆збавлѧ́ющаго ѿ и҆стлѣ́нїѧ живо́тъ тво́й,\\
+ вѣнча́ющаго тѧ̀ млⷭ҇тїю и҆ щедро́тами: \verb+\cuMarginMark{+а҃\verb+}\cuKinovar+\\
+ И҆сполнѧ́ющаго во бл҃ги́хъ жела́нїе твоѐ, ѡ҆бнови́тсѧ ꙗ҆́кѡ ѻ҆́рлѧ \\
+ ю҆́ность твоѧ̀.
+\end{tabular}
+\end{churchslavonic}
+\end{center}
+
+\begin{EN}
+\noindent
+Will result in:
+\end{EN}
+%
+\begin{RU}
+\noindent
+Получим такой результат:
\end{RU}
+\begin{center}
+\begin{churchslavonic}
+\let\hMn=\cuMarginMark
+\let\hKv=\cuKinovar
+\parbox{0.75\textwidth}{%
+ \textwidth=0.75\textwidth
+ \hMn{в҃}\hKv Бл҃гословѝ дꙋшѐ моѧ̀ гдⷭ҇а и҆ не забыва́й всѣ́хъ воздаѧ́нїй є҆гѡ̀.
+ \hMn{а҃}\hKv Ѡ҆чища́ющаго всѧ̑ беззакѡ́нїѧ твоѧ̑, и҆сцѣлѧ́ющаго всѧ̑ недꙋ́ги твоѧ̑:
+ \hMn{в҃}\hKv И҆збавлѧ́ющаго ѿ и҆стлѣ́нїѧ живо́тъ тво́й, вѣнча́ющаго тѧ̀ млⷭ҇тїю и҆ щедро́тами:
+ \hMn{а҃}\hKv И҆сполнѧ́ющаго во бл҃ги́хъ жела́нїе твоѐ, ѡ҆бнови́тсѧ ꙗ҆́кѡ ѻ҆́рлѧ ю҆́ность твоѧ̀.
+}
+\end{churchslavonic}
+\end{center}
+
\begin{EN}
-\section{Utilities}
-The mechanism that \cs{cuKinovar} macro is using to collect all accents (when argument is given implicitly) can be useful for
-many other purposes. One example is to typeset a dropletter at the beginning of a chapter (this is often used in Church Slavonic
-texts). For this purpose standard \LaTeX\ package \pkg{lettrine} works fine. The only nuisance is that one have to be careful to
-pass to \cs{lettrine} not just the first letter, but also all diacritical marks for this letter. Naturally, we want to reuse the
-clever mechanism that \cs{cuKinovar} is using to do the collection job.
+The marginal mark is placed on the right margin for odd pages
+and on the left margin for even pages (e.g.~the mark is placed on the
+``outer'' margin, not the spine margin), which is usualy the desired behavior.
-Here is an example how to accomplish that:
+The distance between the mark and the text is controlled by the value
+of \cs{cuMarginMarkSkip}. The default is:
+\end{EN}
+%
+\begin{RU}
+Помета помещается на ``внешнее'' поле, то есть справа от текста для нечетных страниц и слева от текста для четных.
+
+Расстояние между пометой и текстом задается через значение \cs{cuMarginMarkSkip}. По умолчанию это:
+\end{RU}
+%
+\begin{verbatim}
+\def\cuMarginMarkSkip{0.6em}
+\end{verbatim}
+
+\begin{EN}
+To globally customize the font and color of the margin mark use \cs{cuMarginMarkText}.
+For example, to make margin marks appear in red color, redefine \cs{cuMarginMarkText} in the preamble of your
+document like this:
+\end{EN}
+%
+\begin{RU}
+Шрифт и цвет пометы можно изменить, переопределив команду \cs{cuMarginMarkText}.
+Например, если Вы хотите чтобы все пометы печатались красным цветом, то достаточно поместить
+в преамбулу вашего документа следующее определение:
+\end{RU}
+\begin{verbatim}
+\def\cuMarginMarkText#1{\cuKinovar{#1}}
+\end{verbatim}
+
+\begin{EN}
+If you need to change the font/size/color just for a single mark, you can do it directly with \cs{cuMarginMark}:
\end{EN}
\begin{RU}
-\section{Утилиты}
+Если надо поменять размер, цвет, или шрифт для какой-то одной пометы, то проще всего это сделать при
+вызове \cs{cuMarginMark}:
+\end{RU}
+
+\begin{verbatim}
+\cuMarginMark{{\tiny *}}
+\end{verbatim}
+
+\begin{EN}
+\subsection{Dropcaps}
+The mechanism that the \cs{cuKinovar} macro is using to collect all accents
+(when the argument is specified implicitly) can be useful for
+many other purposes. One example is to typeset a dropletter at the beginning of a chapter
+(this is often used in Church Slavonic texts). For this purpose, the standard \LaTeX\ package
+\pkg{lettrine} works just fine. The only nuisance is that one has to be careful to
+pass to \cs{lettrine} not just the first letter, but also any diacritical marks that
+attach to this letter. Naturally, we want to reuse the
+clever mechanism that \cs{cuKinovar} uses, and automatically collect the diacritical marks!
+
+Here is an example of how to accomplish this:
+\end{EN}
+
+\begin{RU}
+\subsection{Буквицы}
Механизм, используемый командой \cs{cuKinovar} для сбора выносных символов (при неявном задании аргумента), может оказаться полезен
в некоторых других случаях. Один из примеров --- это ``буквицы'' в начале разделов. Для набора буквицы отлично работает стандартный
-пакет \pkg{lettrine}. Единственное неудобство --- это необходимость задавать явно первую букву вместе во всеми ее выносными символами.
-Естественно желание упростить и автоматизировать эту работу задействовав тот же механизм что и в \cs{cuKinovar}.
+пакет \pkg{lettrine}. Единственное неудобство --- это необходимость задавать явно первую букву вместе со всеми ее выносными символами.
+Естественно желание упростить и автоматизировать эту работу задействовав тот же механизм, что и в \cs{cuKinovar}.
Вот как можно добиться этого:
\end{RU}
@@ -532,7 +724,7 @@
\end{center}
%
\begin{EN}
-Once this definition of \verb+\cuLettrine+ is created (put is somewhere in preamble, and do not forget to enclose in \cs{makeatletter} and \cs{makeatother}),
+Once this definition of \verb+\cuLettrine+ is created (somewhere in the preamble, between the declarations \cs{makeatletter} and \cs{makeatother}),
you can create drop capitals like this:
\end{EN}
%
@@ -549,21 +741,26 @@
\end{churchslavonic}
\end{center}
+\begin{center}
\begin{churchslavonic}
+\parbox{0.75\textwidth}{%
+\textwidth=0.75\textwidth
+
\cuLettrine
И҆́же дх҃а си́ла въ не́мощи соверша́етсѧ, ꙗ҆́коже пи́сано є҆́сть, и҆ вѣ́рꙋемъ: въ не́мощи же не тѣлесѐ то́чїю, но ᲂу҆́бѡ и҆ сло́ва,
и҆ премꙋ́дрости на ѧ҆зы́цѣ лежа́ща. И҆ сѐ ꙗ҆́вѣ ѿ мно́гихъ ᲂу҆́бѡ и҆ны́хъ, па́че же ѿ и҆́же ѡ҆ вели́комъ бг҃осло́вѣ, и҆ бра́тѣ хрⷭ҇то́вѣ,
благода́тїю зри́мѣмъ.
-
+}%
\end{churchslavonic}
+\end{center}
\begin{thebibliography}{9}
\bibitem{UN41}
Aleksandr Andreev, Yuri Shardt, and Nikita Simmons.
\emph{Church Slavonic Typography in Unicode},
- Uncode Technical Note~41,
+ Uncode Technical Note~41. 2015.
\url{http://www.unicode.org/notes/tn41/}
\end{thebibliography}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/churchslavonic.doc.tlpobj new/tlpkg/tlpobj/churchslavonic.doc.tlpobj
--- old/tlpkg/tlpobj/churchslavonic.doc.tlpobj 2016-05-17 03:18:18.000000000 +0200
+++ new/tlpkg/tlpobj/churchslavonic.doc.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -1,9 +1,9 @@
name churchslavonic.doc
category Package
-revision 41182
+revision 42751
shortdesc doc files of churchslavonic
relocated 1
-docfiles size=63
+docfiles size=58
RELOC/doc/latex/churchslavonic/LICENSE
RELOC/doc/latex/churchslavonic/README
RELOC/doc/latex/churchslavonic/churchslavonic-en.pdf
++++++ churchslavonic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/churchslavonic.sty new/tex/latex/churchslavonic/churchslavonic.sty
--- old/tex/latex/churchslavonic/churchslavonic.sty 2016-05-16 00:16:48.000000000 +0200
+++ new/tex/latex/churchslavonic/churchslavonic.sty 2016-11-25 19:33:45.000000000 +0100
@@ -1,9 +1,9 @@
-% Copyright 2016 Slavonic Computing Initialive
+% Copyright 2016 Slavonic Computing Initiative
% http://sci.ponomar.net
%
-\ProvidesPackage{churchslavonic}[2016/04/19 v0.1 Typesetting in Church Slavonic]
+\ProvidesPackage{churchslavonic}[2016/04/19 v0.2 Typesetting in Church Slavonic]
-\DeclareOption{gray}{
+\DeclareOption*{
\PassOptionsToPackage{\CurrentOption}{cu-kinovar}
}
\ProcessOptions\relax
@@ -13,4 +13,28 @@
\RequirePackage{cu-util}
\RequirePackage{cu-kinovar}
+% underscore is a valid character in Church Slavonic
+\let\cu@oldunderscore=_
+\catcode`\_\active
+\protected\def_{\ifmmode\cu@oldunderscore\else\textunderscore\discretionary{}{}{}\fi}
+
+% suppress variable distance between lines
+\lineskiplimit -1ex
+
+% margin marks
+\def\cu@mmark@counter{0}%
+\def\cuMarginMarkSkip{0.6em}%
+\def\cuMarginMarkText#1{#1}%
+\protected\def\cuMarginMark#1{%
+\leavevmode
+\global\edef\cu@mmark@counter{\the\numexpr 1 + \cu@mmark@counter}%
+\label{mnote.\cu@mmark@counter}%
+\ifodd\getpagerefnumber{mnote.\cu@mmark@counter}\relax
+ \vadjust{\hbox{\vbox to 0pt{\vss\hbox to 0pt{\hskip\textwidth\hskip\cuMarginMarkSkip \cuMarginMarkText{#1}\hss}\vskip 0.25\baselineskip}}}%
+\else
+ \vadjust{\hbox{\vbox to 0pt{\vss\hbox to 0pt{\hss \cuMarginMarkText{#1}\hskip\cuMarginMarkSkip}\vskip 0.25\baselineskip}}}%
+\fi
+}%
+
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/cu-calendar.sty new/tex/latex/churchslavonic/cu-calendar.sty
--- old/tex/latex/churchslavonic/cu-calendar.sty 2016-05-16 00:16:48.000000000 +0200
+++ new/tex/latex/churchslavonic/cu-calendar.sty 2016-11-25 19:33:45.000000000 +0100
@@ -34,10 +34,10 @@
\the\numexpr #1 + \intcalcDiv{#2}{400} + 32083 - 32045\relax%
}%
%
-\def\cu@jdnFromJulianDate#1{%
+\def\cu@jdnFromDateJulian#1{%
\cu@jdn #1-\@firstoftwo
}%
-\def\cu@jdnFromGregorianDate#1{%
+\def\cu@jdnFromDateGregorian#1{%
\cu@jdn #1-\greg@
}%
%
@@ -72,10 +72,10 @@
}}%
%
\def\cu@julianToGregorian#1{%
- \cu@calendarGregorian{\cu@jdnFromJulianDate{#1}}%
+ \cu@calendarGregorian{\cu@jdnFromDateJulian{#1}}%
}%
\def\cu@gregorianToJulian#1{%
- \cu@calendarJulian{\cu@jdnFromGregorianDate{#1}}%
+ \cu@calendarJulian{\cu@jdnFromDateGregorian{#1}}%
}%
\let\cu@julianFromGregorian\cu@gregorianToJulian
\let\cu@gregorianFromJulian\cu@julianToGregorian
@@ -85,10 +85,10 @@
\let\cuAsJulian\cu@julianFromGregorian
\let\cuAsGregorian\cu@gregorianFromJulian
%
-\def\cuJulianDate#1{%
+\def\cuDateJulian#1{%
\expandafter\cu@formatDate\number\cu@julianFromGregorian{#1}\relax
}%
-\def\cuJulianToday{%
+\def\cuTodayJulian{%
\cu@julianFromGregorian{\year -\month -\day}%
}%
\def\cuToday{%
@@ -141,8 +141,8 @@
\expandafter\let\expandafter\cu@current@dateformat\csname cs@dateformat@#1\endcsname
}%
\def\cu@@formatDate#1-#2-#3\relax{%
- \edef\cu@JDN{\cu@jdnFromGregorianDate{#1-#2-#3}}%
- \edef\cu@JDN@March@First{\cu@jdnFromJulianDate{#1-3-1}}%
+ \edef\cu@JDN{\cu@jdnFromDateGregorian{#1-#2-#3}}%
+ \edef\cu@JDN@March@First{\cu@jdnFromDateJulian{#1-3-1}}%
\edef\cuYEAR{\number #1}%
\edef\cuYEARAM{\the\numexpr #1 + 5508\ifnum\cu@JDN<\cu@JDN@March@First\else + 1\fi}%
\edef\cuMONTH{\number #2}%
@@ -151,9 +151,9 @@
\edef\cuINDICTION{\intcalcAdd{15}{\intcalcMod{#1 - 312}{-15}}}%
\edef\cuDISPLAYDATE{\cu@current@dateformat}%
}%
-\def\cu@@formatJulianDate#1-#2-#3\relax{%
- \edef\cu@JDN{\cu@jdnFromJulianDate{#1-#2-#3}}%
- \edef\cu@JDN@March@First{\cu@jdnFromJulianDate{#1-3-1}}%
+\def\cu@@formatDateJulian#1-#2-#3\relax{%
+ \edef\cu@JDN{\cu@jdnFromDateJulian{#1-#2-#3}}%
+ \edef\cu@JDN@March@First{\cu@jdnFromDateJulian{#1-3-1}}%
\edef\cuYEAR{\number #1}%
\edef\cuYEARAM{\the\numexpr #1 + 5508\ifnum\cu@JDN<\cu@JDN@March@First\else + 1\fi}%
\edef\cuMONTH{\number #2}%
@@ -169,14 +169,14 @@
\egroup
}%
%
-\protected\def\cu@formatJulianDate#1-#2-#3\relax{%
+\protected\def\cu@formatDateJulian#1-#2-#3\relax{%
\bgroup
- \cu@@formatJulianDate#1-#2-#3\relax
+ \cu@@formatDateJulian#1-#2-#3\relax
\cuDISPLAYDATE
\egroup
}%
\cuDefineDateFormat{default}{%
- \cuNum{\cuDAY}~\cuMonthName{\cuMONTH}~лѣ́та~\cuNum{\cuYEAR}%
+ \cuNum{\cuDAY}~\cuMonthName{\cuMONTH},~лѣ́та~\cuNum{\cuYEAR}%
}%
\cuUseDateFormat{default}%
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/cu-kinovar.sty new/tex/latex/churchslavonic/cu-kinovar.sty
--- old/tex/latex/churchslavonic/cu-kinovar.sty 2016-05-16 00:16:48.000000000 +0200
+++ new/tex/latex/churchslavonic/cu-kinovar.sty 2016-11-25 19:33:45.000000000 +0100
@@ -16,6 +16,10 @@
\renewcommand{\cu@kinovar}[1]{\textcolor{kinovar-gray}{#1}}
\renewcommand{\cu@kinovar@color}{\color{kinovar-gray}}
}
+\DeclareOption{grey}{
+ \renewcommand{\cu@kinovar}[1]{\textcolor{kinovar-gray}{#1}}
+ \renewcommand{\cu@kinovar@color}{\color{kinovar-gray}}
+}
\DeclareOption{bw}{
\renewcommand{\cu@kinovar}[1]{#1}
\renewcommand{\cu@kinovar@color}{\relax}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/gloss-churchslavonic.ldf new/tex/latex/churchslavonic/gloss-churchslavonic.ldf
--- old/tex/latex/churchslavonic/gloss-churchslavonic.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/churchslavonic/gloss-churchslavonic.ldf 2016-12-20 00:01:04.000000000 +0100
@@ -0,0 +1,245 @@
+\ProvidesFile{gloss-churchslavonic.ldf}[polyglossia: module for Church Slavonic]
+\PolyglossiaSetup{churchslavonic}{
+ script=Cyrillic,
+ scripttag=cyrl,
+ langtag=CHU,
+ hyphennames={churchslavonic},
+ hyphenmins={1,2},
+ frenchspacing=true,
+ fontsetup=true
+}
+
+% if spelling is set to modern, Russian date and caption
+% as well as ASCII digits are used.
+\define@key{churchslavonic}{spelling}[modern]{%
+ \ifstrequal{#1}{traditional}%
+ {\def\captionschurchslavonic{\captionschurchslavonic@traditional}%
+ \def\datechurchslavonic{\datechurchslavonic@traditional}}%
+ {\def\captionschurchslavonic{\captionschurchslavonic@modern}%
+ \def\datechurchslavonic{\datechurchslavonic@modern}}%
+}
+
+\newif\ifcyrillic@numerals
+\define@key{churchslavonic}{numerals}[latin]{%
+ \ifstrequal{#1}{cyrillic}%
+ {\cyrillic@numeralstrue}
+ {\cyrillic@numeralsfalse}%
+}
+
+\define@boolkey{churchslavonic}[churchslavonic@]{babelshorthands}[false]{}
+
+\setkeys{churchslavonic}{spelling,numerals}
+
+\ifsystem@babelshorthands
+ \setkeys{churchslavonic}{babelshorthands=true}
+\else
+ \setkeys{churchslavonic}{babelshorthands=false}
+\fi
+
+\ifcsundef{initiate@active@char}{%
+ \input{babelsh.def}%
+ \initiate@active@char{"}%
+}{}
+
+\def\churchslavonic@shorthands{%
+ \bbl@activate{"}%
+ \def\language@group{churchslavonic}%
+% \declare@shorthand{russian}{"`}{„}%
+% \declare@shorthand{russian}{"'}{“}%
+% \declare@shorthand{russian}{"<}{«}%
+% \declare@shorthand{russian}{">}{»}%
+ \declare@shorthand{churchslavonic}{""}{\hskip\z@skip}%
+ \declare@shorthand{churchslavonic}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+ \declare@shorthand{churchslavonic}{"=}{\nobreak-\hskip\z@skip}%
+ \declare@shorthand{churchslavonic}{"|}{\textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}%
+ \declare@shorthand{churchslavonic}{"-}{%
+ \def\churchslavonic@sh@tmp{%
+ \if\churchslavonic@sh@next-\expandafter\churchslavonic@sh@emdash
+ \else\expandafter\churchslavonic@sh@hyphen\fi
+ }%
+ \futurelet\churchslavonic@sh@next\churchslavonic@sh@tmp}%
+ \def\churchslavonic@sh@hyphen{%
+ \nobreak\-\bbl@allowhyphens}%
+ \def\churchslavonic@sh@emdash##1##2{\cdash-##1##2}%
+ \def\cdash##1##2##3{\def\tempx@{##3}%
+ \def\tempa@{-}\def\tempb@{~}\def\tempc@{*}%
+ \ifx\tempx@\tempa@\@Acdash\else
+ \ifx\tempx@\tempb@\@Bcdash\else
+ \ifx\tempx@\tempc@\@Ccdash\else
+ \errmessage{Wrong usage of cdash}\fi\fi\fi}%
+ \def\@Acdash{\ifdim\lastskip>\z@\unskip\nobreak\hskip.2em\fi
+ \cyrdash\hskip.2em\ignorespaces}%
+ \def\@Bcdash{\leavevmode\ifdim\lastskip>\z@\unskip\fi
+ \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}%
+ \def\@Ccdash{\leavevmode
+ \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
+ \ifx\cyrdash\undefined
+ \def\cyrdash{\hbox to.8em{--\hss--}}
+ \fi
+ \declare@shorthand{churchslavonic}{",}{\nobreak\hskip.2em\ignorespaces}%
+}
+
+\def\nochurchslavonic@shorthands{%
+ \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+
+\def\captionschurchslavonic@modern{%
+ \def\prefacename{Предисловие}%
+ \def\refname{Список литературы}%
+ \def\abstractname{Аннотация}%
+ \def\bibname{Литература}%
+\def\chaptername{Глава}%
+ \def\appendixname{Приложение}%
+ \ifcsundef{thechapter}%
+ {\def\contentsname{Содержание}}%
+ {\def\contentsname{Оглавление}}%
+ \def\listfigurename{Список иллюстраций}%
+ \def\listtablename{Список таблиц}%
+ \def\indexname{Предметный указатель}%
+ \def\authorname{Именной указатель}%
+ \def\figurename{Рис.}%
+ \def\tablename{Таблица}%
+ \def\partname{Часть}%
+ \def\enclname{вкл.}%
+ \def\ccname{исх.}%
+ \def\headtoname{вх.}%
+ \def\pagename{с.}%
+ \def\seename{см.}%
+ \def\alsoname{см.~также}%
+ \def\proofname{Доказательство}%
+}
+\def\datechurchslavonic@modern{%
+ \def\today{\number\day%
+ \space\ifcase\month\or%
+ января\or
+ февраля\or
+ марта\or
+ апреля\or
+ мая\or
+ июня\or
+ июля\or
+ августа\or
+ сентября\or
+ октября\or
+ ноября\or
+ декабря\fi%
+ \space \number\year\space г.}}
+
+\def\captionschurchslavonic@traditional{%
+ \def\prefacename{Предисло́вїе}%
+ \def\refname{Примѣча̑нїѧ}%
+ \def\abstractname{А҆ннота́цїѧ}%
+ \def\bibname{Вивлїогра́фїѧ}%
+ \def\chaptername{Глава̀}%
+ \def\appendixname{Приложе́нїе}%
+ \ifcsundef{thechapter}%
+ {\def\contentsname{Содержа́нїе}}%
+ {\def\contentsname{Ѡ҆главле́нїе}}%
+ \def\listfigurename{Надписа́нїе и҆з̾ѡбраже́нїй}%
+ \def\listtablename{Надписа́нїе табли́цъ}%
+ \def\indexname{Предмѣ́тный ᲂу҆каза́тель}%
+ \def\authorname{И҆менно́й ᲂу҆каза́тель}%
+ \def\figurename{И҆з̾ѡбраже́нїе}%
+ \def\tablename{Табли́ца}%
+ \def\partname{Ча́сть}%
+ \def\enclname{вкл.}%
+ \def\ccname{исх.}%
+ \def\headtoname{вх.}%
+ \def\pagename{с.}%
+ \def\seename{зрѝ}%
+ \def\alsoname{зрѝ~та́кожде}%
+ \def\proofname{Доказа́тельство}%
+}
+\def\datechurchslavonic@traditional{%
+ \def\today{\number\day%
+ \space\ifcase\month\or%
+ і҆аннꙋа́рїа\or
+ феврꙋа́рїа\or
+ ма́рта\or
+ а҆прі́ллїа\or
+ ма́їа\or
+ і҆ꙋ́нїа\or
+ і҆ꙋ́лїа\or
+ а҆́ѵгꙋста\or
+ септе́мврїа\or
+ ѻ҆ктѡ́врїа\or
+ ное́мврїа\or
+ деке́мврїа\fi%
+ \space л.\space\number\year\space}}
+
+% The following is based on some ideas from ruscor.sty
+\def\churchslavonic@capsformat{%
+ \def\@seccntformat##1{\csname pre##1\endcsname%
+ \csname the##1\endcsname%
+ \csname post##1\endcsname}%
+ \def\@aftersepkern{\hspace{0.5em}}%
+ \def\postchapter{.\@aftersepkern}%
+ \def\postsection{.\@aftersepkern}%
+ \def\postsubsection{.\@aftersepkern}%
+ \def\postsubsubsection{.\@aftersepkern}%
+ \def\postparagraph{.\@aftersepkern}%
+ \def\postsubparagraph{.\@aftersepkern}%
+ \def\prechapter{}%
+ \def\presection{}%
+ \def\presubsection{}%
+ \def\presubsubsection{}%
+ \def\preparagraph{}%
+ \def\presubparagraph{}}
+
+\def\Azbuk#1{\expandafter\churchslavonic@Alph\csname c@#1\endcsname}
+\def\churchslavonic@Alph#1{\ifcase#1\or
+ А\or Б\or В\or Г\or Д\or Є\or Ж\or Ѕ\or
+ З\or И\or І\or К\or Л\or М\or Н\or О\or
+ П\or Р\or С\or Т\or Ꙋ\or Ф\or Х\or Ѿ\or
+ Ц\or Ч\or Ш\or Щ\or Ъ\or Ы\or Ь\or Ѣ\or
+ Ю\or Ѫ\or Ѧ\or Ѯ\or Ѱ\or Ѳ\or Ѵ\else\xpg@ill@value{#1}{churchslavonic@Alph}\fi}
+
+\def\azbuk#1{\expandafter\churchslavonic@alph\csname c@#1\endcsname}
+\def\churchslavonic@alph#1{\ifcase#1\or
+ а\or б\or в\or г\or д\or е\or ж\or ѕ\or
+ з\or и\or ї\or к\or л\or м\or н\or о\or
+ п\or р\or с\or т\or ꙋ\or ф\or х\or ѿ\or
+ ц\or ч\or ш\or щ\or ъ\or ы\or ь\or ѣ\or
+ ю\or ѫ\or ѧ\or ѯ\or ѱ\or ѳ\or ѵ\else\xpg@ill@value{#1}{churchslavonic@alph}\fi}
+
+%% Deleting stuff for Cyrillic numerals
+%% TODO: link with cu-num package
+\def\noextras@churchslavonic{%
+ \def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel
+ \ifcyrillic@numerals\nochurchslavonic@numbers\fi
+ \nochurchslavonic@shorthands%
+}
+
+\def\blockextras@churchslavonic{%
+ \churchslavonic@capsformat%
+ \ifcyrillic@numerals\churchslavonic@numbers\fi
+ \ifchurchslavonic@babelshorthands\churchslavonic@shorthands\fi
+}
+
+\def\inlineextras@churchslavonic{%
+ \ifchurchslavonic@babelshorthands\churchslavonic@shorthands\fi%
+}
+
+%%% These lines taken from russianb.ldf, part of babel package.
+% make it optional?
+\def\sh {\mathop{\operator@font sh}\nolimits}
+\def\ch {\mathop{\operator@font ch}\nolimits}
+\def\tg {\mathop{\operator@font tg}\nolimits}
+\def\arctg {\mathop{\operator@font arctg}\nolimits}
+\def\arcctg{\mathop{\operator@font arcctg}\nolimits}
+\def\th {\mathop{\operator@font th}\nolimits}
+\def\ctg {\mathop{\operator@font ctg}\nolimits}
+\def\cth {\mathop{\operator@font cth}\nolimits}
+\def\cosec {\mathop{\operator@font cosec}\nolimits}
+\def\Prob {\mathop{\kern\z@\mathsf{P}}\nolimits}
+\def\Variance{\mathop{\kern\z@\mathsf{D}}\nolimits}
+\def\nod {\mathop{\mathrm{н.о.д.}}\nolimits}
+\def\nok {\mathop{\mathrm{н.о.к.}}\nolimits}
+\def\NOD {\mathop{\mathrm{НОД}}\nolimits}
+\def\NOK {\mathop{\mathrm{НОК}}\nolimits}
+\def\Proj {\mathop{\mathrm{Пр}}\nolimits}
+%\DeclareRobustCommand{\No}{№}
+
+\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/churchslavonic.tlpobj new/tlpkg/tlpobj/churchslavonic.tlpobj
--- old/tlpkg/tlpobj/churchslavonic.tlpobj 2016-05-17 03:18:19.000000000 +0200
+++ new/tlpkg/tlpobj/churchslavonic.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -1,24 +1,27 @@
name churchslavonic
category Package
-revision 41182
-shortdesc Typesetting documents in Church Slavonic language using Unicode
+revision 42751
+shortdesc Typeset documents in Church Slavonic language using Unicode
relocated 1
-longdesc The package provides fonts, hyphenation patterns and supporting
-longdesc macros to typeset Church Slavonic texts.
+longdesc The package provides fonts, hyphenation patterns, and
+longdesc supporting macros to typeset Church Slavonic texts. It depends
+longdesc on the following other packages: fonts-churchslavonic, hyph-
+longdesc utf8, intcalc, etoolbox, and xcolor.
depend fonts-churchslavonic
depend hyphen-churchslavonic
depend etoolbox
depend oberdiek
depend xcolor
-runfiles size=8
+runfiles size=11
RELOC/tex/latex/churchslavonic/churchslavonic.sty
RELOC/tex/latex/churchslavonic/cu-calendar.sty
RELOC/tex/latex/churchslavonic/cu-kinovar.sty
RELOC/tex/latex/churchslavonic/cu-num.sty
RELOC/tex/latex/churchslavonic/cu-util.sty
+ RELOC/tex/latex/churchslavonic/gloss-churchslavonic.ldf
catalogue-also fonts-churchslavonic
catalogue-ctan /language/churchslavonic
-catalogue-date 2016-05-15 08:36:48 +0200
-catalogue-license other-free
+catalogue-date 2016-12-19 08:43:39 +0100
+catalogue-license mit
catalogue-topics churchslavonic multilingual-addon
-catalogue-version 0.1
+catalogue-version 0.2.1
++++++ cinzel.doc.tar.xz ++++++
++++++ cinzel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cinzel.tlpobj new/tlpkg/tlpobj/cinzel.tlpobj
--- old/tlpkg/tlpobj/cinzel.tlpobj 2016-04-14 18:49:55.000000000 +0200
+++ new/tlpkg/tlpobj/cinzel.tlpobj 2017-04-14 17:35:02.000000000 +0200
@@ -100,6 +100,6 @@
RELOC/tex/latex/cinzel/TS1CinzelDecorative-LF.fd
RELOC/tex/latex/cinzel/cinzel.sty
catalogue-ctan /fonts/cinzel
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license ofl
catalogue-topics font font-decor font-type1 font-ttf
++++++ circ.doc.tar.xz ++++++
++++++ circ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/circ.tlpobj new/tlpkg/tlpobj/circ.tlpobj
--- old/tlpkg/tlpobj/circ.tlpobj 2016-04-14 18:49:57.000000000 +0200
+++ new/tlpkg/tlpobj/circ.tlpobj 2017-04-14 17:35:03.000000000 +0200
@@ -33,7 +33,7 @@
RELOC/tex/latex/circ/physics.def
catalogue-also circuit-macros
catalogue-ctan /macros/generic/diagrams/circ
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics diagram-circ
catalogue-version 1.1
++++++ circuitikz.doc.tar.xz ++++++
Binary files old/doc/context/third/circuitikz/circuitikz-context.pdf and new/doc/context/third/circuitikz/circuitikz-context.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/circuitikz/CHANGELOG.md new/doc/generic/circuitikz/CHANGELOG.md
--- old/doc/generic/circuitikz/CHANGELOG.md 2016-06-07 01:01:18.000000000 +0200
+++ new/doc/generic/circuitikz/CHANGELOG.md 2017-06-06 01:20:06.000000000 +0200
@@ -1,6 +1,54 @@
The major changes among the different circuitikz versions are listed here. See https://github.com/circuitikz/circuitikz/commits for a full list of changes.
+* Version 0.8.3 (2017-05-28)
+ - Removed unwanted lines at to-paths if the starting point is a node without a explicit anchor.
+ - Fixed scaling option, now all parts are scaled by bipoles/length
+ - Surge arrester appears no more if a to path is used without []-options
+ - Fixed current placement now possible with paths at an angle of around 280°
+ - Fixed voltage placement now possible with paths at an angle of around 280°
+ - Fixed label and annotation placement (at some angles position not changable)
+ - Adjustable default distance for straight-voltages: 'bipoles/voltage/straight label distance'
+ - Added Symbol for bandstop filter
+ - New annotation type to show flows using f=... like currents, can be used for thermal, power or current flows
+
+* Version 0.8.2 (2017-05-01)
+ - Fixes pgfkeys error using alternatively specified mixed colors(see pgfplots manual section "4.7.5 Colors")
+ - Added new switches "ncs" and "nos"
+ - Reworked arrows at spst-switches
+ - Fixed direction of controlled american voltage source
+ - "v<=" and "i<=" do not rotate the sources anymore(see them as "counting direction indication", this can be different then the shape orientation); Use the option "invert" to change the direction of the source/apperance of the shape.
+ - current label "i=" can now be used independent of the regular label "l=" at current sources
+ - rewrite of current arrow placement. Current arrows can now also be rotated on zero-length paths
+ - New DIN/EN compliant operational amplifier symbol "en amp"
+
+* Version 0.8.1 (2017-03-25)
+ - Fixed unwanted line through components if target coordinate is a name of a node
+ - Fixed position of labels with subscript letters.
+ - Absolute distance calculation in terms of ex at rotated labels
+ - Fixed label for transistor paths (no label drawn)
+
+* Version 0.8 (2017-03-08)
+ - Allow use of voltage label at a [short]
+ - Correct line joins between path components (to[...])
+ - New Pole-shape .-. to fill perpendicular joins
+ - Fixed direction of controlled american current source
+ - Fixed incorrect scaling of magnetron
+ - Fixed: Number of american inductor coils not adjustable
+ - Fixed Battery Symbols and added new battery2 symbol
+ - Added non-inverting Schmitttrigger
+
+* Version 0.7 (2016-09-08)
+ - Added second annotation label, showing, e.g., the value of an component
+ - Added new symbol: magnetron
+ - Fixed name conflict of diamond shape with tikz.shapes package
+ - Fixed varcap symbol at small scalings
+ - New packet-option "straightvoltages, to draw straight(no curved) voltage arrows
+ - New option "invert" to revert the node direction at paths
+ - Fixed american voltage label at special sources and battery
+ - Fixed/rotated battery symbol(longer lines by default positive voltage)
+ - New symbol Schmitttrigger
+
* Version 0.6 (2016-06-06)
- Added Mechanical Symbols (damper,mass,spring)
- Added new connection style diamond, use (d-d)
@@ -58,7 +106,7 @@
- rename of context.tex and context.pdf (thanks to Karl Berry)
- updated the email address
- in documentation, fixed wrong (non-standard) labelling of the axis in an example (thanks to prof. Claudio Beccaria)
- - fixed scaling inconsistencies in quadrupoles
+ - fixed scaling inconsistencies in quadrupoles
- fixed division by zero error on certain vertical paths
- introduced options straighlabels, rotatelabels, smartlabels
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/circuitikz/README.md new/doc/generic/circuitikz/README.md
--- old/doc/generic/circuitikz/README.md 2016-06-07 01:01:18.000000000 +0200
+++ new/doc/generic/circuitikz/README.md 2017-03-25 21:53:31.000000000 +0100
@@ -1,8 +1,6 @@
circuitikz
==========
-This is CircuiTikz, version 0.6 (2016-06-05).
-
This package provides a set of macros for naturally typesetting electrical and (somewhat less naturally, perhaps) electronical networks.
It was born mainly for writing my own exercise book and exams sheets for the Elettrotecnica courses at Politecnico di Milano, Italy. I wanted a tool that was easy to use, with a lean syntax, native to LaTeX, and supporting directly PDF output format.
@@ -12,7 +10,7 @@
--------------
## Requirements
-* Tikz graphics library, version 2
+* Tikz/PGF graphics library, version 3
* xstrings not older than 2009/03/13
## Installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/circuitikz/changelog.tex new/doc/latex/circuitikz/changelog.tex
--- old/doc/latex/circuitikz/changelog.tex 2016-06-07 01:01:18.000000000 +0200
+++ new/doc/latex/circuitikz/changelog.tex 2017-06-06 01:20:06.000000000 +0200
@@ -4,12 +4,135 @@
full list of changes.
\begin{itemize}
-\itemsep1pt\parskip0pt\parsep0pt
+\tightlist
+\item
+ Version 0.8.3 (2017-05-28)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Removed unwanted lines at to-paths if the starting point is a node
+ without a explicit anchor.
+ \item
+ Fixed scaling option, now all parts are scaled by bipoles/length
+ \item
+ Surge arrester appears no more if a to path is used without
+ {[}{]}-options
+ \item
+ Fixed current placement now possible with paths at an angle of
+ around 280°
+ \item
+ Fixed voltage placement now possible with paths at an angle of
+ around 280°
+ \item
+ Fixed label and annotation placement (at some angles position not
+ changable)
+ \item
+ Adjustable default distance for straight-voltages:
+ `bipoles/voltage/straight label distance'
+ \item
+ Added Symbol for bandstop filter
+ \item
+ New annotation type to show flows using f=\ldots{} like currents,
+ can be used for thermal, power or current flows
+ \end{itemize}
+\item
+ Version 0.8.2 (2017-05-01)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Fixes pgfkeys error using alternatively specified mixed colors(see
+ pgfplots manual section ``4.7.5 Colors'')
+ \item
+ Added new switches ``ncs'' and ``nos''
+ \item
+ Reworked arrows at spst-switches
+ \item
+ Fixed direction of controlled american voltage source
+ \item
+ ``v\textless{}='' and ``i\textless{}='' do not rotate the sources
+ anymore(see them as ``counting direction indication'', this can be
+ different then the shape orientation); Use the option ``invert'' to
+ change the direction of the source/apperance of the shape.
+ \item
+ current label ``i='' can now be used independent of the regular
+ label ``l='' at current sources
+ \item
+ rewrite of current arrow placement. Current arrows can now also be
+ rotated on zero-length paths
+ \item
+ New DIN/EN compliant operational amplifier symbol ``en amp''
+ \end{itemize}
+\item
+ Version 0.8.1 (2017-03-25)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Fixed unwanted line through components if target coordinate is a
+ name of a node
+ \item
+ Fixed position of labels with subscript letters.
+ \item
+ Absolute distance calculation in terms of ex at rotated labels
+ \item
+ Fixed label for transistor paths (no label drawn)
+ \end{itemize}
+\item
+ Version 0.8 (2017-03-08)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Allow use of voltage label at a {[}short{]}
+ \item
+ Correct line joins between path components (to{[}\ldots{}{]})
+ \item
+ New Pole-shape .-. to fill perpendicular joins
+ \item
+ Fixed direction of controlled american current source
+ \item
+ Fixed incorrect scaling of magnetron
+ \item
+ Fixed: Number of american inductor coils not adjustable
+ \item
+ Fixed Battery Symbols and added new battery2 symbol
+ \item
+ Added non-inverting Schmitttrigger
+ \end{itemize}
+\item
+ Version 0.7 (2016-09-08)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Added second annotation label, showing, e.g., the value of an
+ component
+ \item
+ Added new symbol: magnetron
+ \item
+ Fixed name conflict of diamond shape with tikz.shapes package
+ \item
+ Fixed varcap symbol at small scalings
+ \item
+ New packet-option ``straightvoltages, to draw straight(no curved)
+ voltage arrows
+ \item
+ New option ``invert'' to revert the node direction at paths
+ \item
+ Fixed american voltage label at special sources and battery
+ \item
+ Fixed/rotated battery symbol(longer lines by default positive
+ voltage)
+ \item
+ New symbol Schmitttrigger
+ \end{itemize}
\item
Version 0.6 (2016-06-06)
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
Added Mechanical Symbols (damper,mass,spring)
\item
@@ -37,7 +160,7 @@
Version 0.5 (2016-04-24)
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
new option boxed and dashed for hf-symbols
\item
@@ -55,7 +178,7 @@
Version 0.4
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
minor improvements to documentation
\item
@@ -73,7 +196,7 @@
Version 0.3.1
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
different management of color\ldots{}
\item
@@ -94,7 +217,7 @@
Version 0.3.0
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
fixed gate node for a few transistors
\item
@@ -129,7 +252,7 @@
Version 0.2.4
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
added square voltage source (contributed by Alistair Kwan)
\item
@@ -150,7 +273,7 @@
in documentation, fixed wrong (non-standard) labelling of the axis
in an example (thanks to prof. Claudio Beccaria)
\item
- fixed scaling inconsistencies in quadrupoles\\
+ fixed scaling inconsistencies in quadrupoles
\item
fixed division by zero error on certain vertical paths
\item
@@ -160,7 +283,7 @@
Version 0.2.3
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
fixed compatibility problem with label option from tikz
\item
@@ -210,7 +333,7 @@
Version 0.2.2 - 20090520
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
Added the shape for lamps.
\item
@@ -225,7 +348,7 @@
Version 0.2.1 - 20090503
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
Op-amps added
\item
@@ -236,7 +359,7 @@
Version 0.2 - 20090417 First public release on CTAN
\begin{itemize}
- \itemsep1pt\parskip0pt\parsep0pt
+ \tightlist
\item
\emph{Backward incompatibility}: labels ending with
\texttt{:}\textit{angle} are not parsed for positioning anymore.
Binary files old/doc/latex/circuitikz/circuitikzmanual.pdf and new/doc/latex/circuitikz/circuitikzmanual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/circuitikz/circuitikzmanual.tex new/doc/latex/circuitikz/circuitikzmanual.tex
--- old/doc/latex/circuitikz/circuitikzmanual.tex 2016-06-07 01:01:18.000000000 +0200
+++ new/doc/latex/circuitikz/circuitikzmanual.tex 2017-06-06 01:20:06.000000000 +0200
@@ -44,9 +44,9 @@
\usepackage{hyperref}
\hypersetup{
bookmarks=false, % show bookmarks bar?
- pdftitle={CircuitTikZ v. \pgfcircversion\ - manual}, % title
- pdfauthor={Massimo Redaelli}, % author
- pdfsubject={CircuitTikZ manual}, % subject of the document
+ pdftitle={CircuiTikZ \pgfcircversion\ - manual}, % title
+ pdfauthor={Massimo Redaelli, Stefan Lindner, Stefan Erhardt}, % author
+ pdfsubject={CircuiTikZ manual}, % subject of the document
pdfkeywords={}, % list of keywords
colorlinks=true, % false: boxed links; true: colored links
linkcolor=black, % color of internal links
@@ -92,7 +92,7 @@
\maketitle
\tableofcontents
-
+\cleardoublepage
\section{Introduction}
\subsection{About}
\Circuitikz\ was initiated by Massimo Redaelli in 2007, who was working as a research assistant at the Polytechnic University of Milan, Italy, and needed a tool for creating exercises and exams.
@@ -114,7 +114,7 @@
\bottomrule
\end{tabular}
\end{table}
-\footnotetext{\ConTeXt\ suppurt was added mostly thanks to Mojca Miklavec and Aditya Mahajan.}
+\footnotetext{\ConTeXt\ support was added mostly thanks to Mojca Miklavec and Aditya Mahajan.}
\noindent \TikZ\ will be automatically loaded.
@@ -126,7 +126,7 @@
\subsection{Requirements}
\begin{itemize}
- \item \texttt{tikz}, version $\ge 2$;
+ \item \texttt{tikz}, version $\ge 3$;
\item \texttt{xstring}, not older than 2009/03/13;
\item \texttt{siunitx}, if using \texttt{siunitx} option.
\end{itemize}
@@ -137,7 +137,7 @@
So, if loaded with said option, one must write \verb!(0,0) to[*R] (2,0)! and, for transistors on a path, \verb!(0,0) to[*Tnmos] (2,0)!, and so on (but \verb!(0,0) node[nmos] {}!). See example at page~\pageref{ex:compatibility}.
\subsection{License}
-Copyright \copyright\ 2007--2016 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘as is’, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+Copyright \copyright\ 2007--2017 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘as is’, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
\subsection{Feedback}
The easiest way to contact the authors is via the official Github repository: \url{https://github.com/circuitikz/circuitikz/issues}
@@ -145,10 +145,14 @@
\section{Incompabilities between version}
Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers.
+You can check the used version at your local installation using the macro \verb!\pgfcircversion{}!.
\begin{itemize}
+\item Since v0.8.2: voltage and current label directions(v<= / i<=) do NOT change the orientation of the drawn source shape anymore. Use the "invert" option to rotate the shape of the source. Furthermore, from this version on, the current label(i=) at current sources can be used independent of the regular label(l=).
+\item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions.
\item Since v0.5.1: The parts pfet,pigfete,pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this.
\item Since v0.5: New voltage counting direction, here exists an option to use the old behaviour
\end{itemize}
+For older projects, you can use an older version locally using the git-version and picking the correct commit from the repository (branch gh-pages).
\section{Package options}
@@ -185,6 +189,7 @@
\noindent Here is the list of all the options:
\begin{itemize}
\item \texttt{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources;
+ \item \texttt{straightvoltages}: uses arrows to define voltages, and and uses straight voltage arrows;
\item \texttt{americanvoltages}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources;
\item \texttt{europeancurrents}: uses european-style current sources;
\item \texttt{americancurrents}: uses american-style current sources;
@@ -448,6 +453,7 @@
\begin{itemize}
\circuititembip{battery}{Battery}{}
\circuititembip{battery1}{Single battery cell}{}
+ \circuititembip{battery2}{Single battery cell}{}
\circuititembip{european voltage source}{Voltage source (european style)}{}
\circuititembip{american voltage source}{Voltage source (american style)}{}
\circuititembip{european current source}{Current source (european style)}{}
@@ -483,7 +489,6 @@
\circuititembip{dcisource}{DC current source}{}
\end{itemize}
-
\subsubsection{Mechanical Analogy}
\begin{itemize}
\circuititembip{damper}{Mechanical Damping}{}
@@ -491,18 +496,13 @@
\circuititembip{mass}{Mechanical Mass}{}
\end{itemize}
-
-%\begin{framed}
-%The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the default) and \texttt{americancurrent} [resp. \texttt{americanvoltage}] define which sinusoidal current [resp. voltage] source is selected by default when the abbreviated styles \texttt{sinusoidal current source}, \texttt{csourcesin}, \texttt{cI} [resp. \texttt{sinusoidal voltage source}, \texttt{vsourcesin}, \texttt{cV}] are used.
-
-%One can also use the related styles \texttt{[european currents]} [resp. \texttt{[european voltages]}] and \texttt{[american currents]} [resp. \texttt{[american voltages]}].
-%\end{framed}
-
\subsubsection{Switch}
\begin{itemize}
\circuititembip{switch}{Switch}{spst}
\circuititembip{closing switch}{Closing switch}{cspst}
\circuititembip{opening switch}{Opening switch}{ospst}
+ \circuititembip{normal open switch}{Normally open switch}{nos}
+ \circuititembip{normal closed switch}{Normally closed switch}{ncs}
\circuititembip{push button}{Push button}{}
\end{itemize}
@@ -512,6 +512,7 @@
\circuititembip{twoport}{generic two port\footnote{To specify text to be put in the component: \texttt{twoport[t=text]}): \tikz \draw[scale=.5, transform shape] (0,0) to[twoport,>,t=text] (2,0); }}{}
\circuititembip{vco}{vco}{}
\circuititembip{bandpass}{bandpass}{}
+ \circuititembip{bandstop}{bandstop}{}
\circuititembip{highpass}{highpass}{}
\circuititembip{lowpass}{lowpass}{}
\circuititembip{adc}{A/D converter}{}
@@ -634,6 +635,23 @@
\circuititem{isfet}{\scshape isfet}{}
\end{itemize}
+\subsubsection{Electronic Tubes}
+\begin{itemize}
+ \circuititem{magnetron}{Magnetron}{}
+\end{itemize}
+\begin{LTXexample}[varwidth=true]
+ \begin{circuitikz}
+ \draw (0,-2)node[rground](gnd){} to[voltage source,v<={HV}]++(0,3)--++(1,0)to[V,n=DC]++(2,0);
+ \draw (2,-1) node[magnetron,scale=1](magn){};
+ \draw (DC.left)++(-0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode1);
+ \draw (DC.right)++(0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode2);
+ \draw (magn.anode) to [short] (magn.anode|-gnd) node[rground]{};
+ \draw (magn.cathode1)node[above]{$1$};
+ \draw (magn.cathode2)node[above]{$2$};
+ \draw[->](magn.east) --++(1,0)node[right]{$RF_{out}$};
+ \end{circuitikz}
+\end{LTXexample}
+
\subsubsection{Block diagram}
These come from Stefan Erhardt's contribution of block diagram components. Add a box around them with the option \texttt{box}.
\begin{itemize}
@@ -715,7 +733,7 @@
\subsection{Logic gates}
-
+\subsubsection{American Logic gates}
\begin{itemize}
\circuititem{american and port}{American \textsc{and} port}{}
\circuititem{american or port}{American \textsc{or} port}{}
@@ -725,7 +743,7 @@
\circuititem{american xor port}{American \textsc{xor} port}{}
\circuititem{american xnor port}{American \textsc{xnor} port}{}
\end{itemize}
-
+\subsubsection{European Logic gates}
\begin{itemize}
\circuititem{european and port}{European \textsc{and} port}{}
\circuititem{european or port}{European \textsc{or} port}{}
@@ -742,10 +760,15 @@
If otherwise \texttt{europeanports} option is active (or the style \texttt{[european ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the european version of the respective logic port.
\end{framed}
+\begin{itemize}
+ \circuititem{schmitt}{Non-Inverting \textsc{Schmitttrigger}}{}
+ \circuititem{invschmitt}{Inverting \textsc{Schmitttrigger}}{}
+\end{itemize}
\subsection{Amplifiers}
\begin{itemize}
\circuititem{op amp}{Operational amplifier}{}
+ \circuititem{en amp}{Operational amplifier compliant to DIN/EN 60617 standard}{}
\circuititem{fd op amp}{Fully differential operational amplifier\footnote{Contributed by Kristofer M. Monisit.}}{}
\circuititem{gm amp}{transconductance amplifier}{}
\circuititem{plain amp}{Plain amplifier}{}
@@ -759,6 +782,7 @@
\circuititem{inputarrow}{Arrow to draw at its tip, useful for block diagrams.}{}
\circuititem{circ}{Connected terminal}{}
\circuititem{ocirc}{Unconnected terminal}{}
+ \circuititem{diamondpole}{Diamond-style terminal}{}
\end{itemize}
@@ -810,17 +834,20 @@
;\end{circuitikz}
\end{LTXexample}
-\subsection{Labels}
+\subsection{Labels and Annotations}
+Since Version 0.7, beside the original label (l) option, there is a new option to place a second label, called annotation (a) at each bipole. Up to now this is a beta-test and there can be problems. For example, up to now this option is not compatible with the concurrent use of voltage labels.
+
+The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[R, l^=$R_1$] (2,0);
+ \draw (0,0) to[R, l=$R_1$,a=1<\kilo\ohm>] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[R, l_=$R_1$] (2,0);
+ \draw (0,0) to[R, l_=$R_1$,a^=1<\kilo\ohm>] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -956,10 +983,68 @@
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american]
- \draw (0,0) to[V<=10V, i_=$i_1$] (2,0);
+ \draw (0,0) to[V=10V,invert, i_=$i_1$] (2,0);
\end{circuitikz}
-\end{LTXexample}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+ \draw (0,0) to[dcisource=1A, i_=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+ \draw (0,0) to[dcisource=1A,invert, i_=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\subsection{Flows}\label{flows}
+As an alternative for the current arrows, you can also use the following flows. They can also be used to indicate thermal or power flows. The syntax is pretty the same as for currents.
+
+\textit{This is a new beta feature since version 0.8.3, therefore, please provide bugreports or hints to optimize this feature regarding placement and appearance! This means, that the appearance may change in the future!}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f<=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f_=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f_>=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f<^=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f<_=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R, f>_=$i_1$] (3,0);
+\end{circuitikz}
+\end{LTXexample}
\subsection{Voltages}
See introduction note at Currents (chapter \ref{currents}, page \pageref{currents})!
@@ -1010,7 +1095,18 @@
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[I<=1A, v_=$i_1$] (2,0);
+ \draw (0,0) to[I<=1A, v_=$u_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[I=$~$,l=1A, v_=$u_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[I,l=1A, v_=$u_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -1267,7 +1363,7 @@
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american voltages]
- \draw (0,0) to[cV=$k\cdot a_1$] (2,0);
+ \draw (0,0) to[cV=$k v_e$] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -1280,7 +1376,7 @@
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american voltages]
- \draw (0,0) to[csV=$k\cdot a_1$] (2,0);
+ \draw (0,0) to[csV=$k v_e$] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -1326,7 +1422,8 @@
-\subsection{Mirroring}
+\subsection{Mirroring and Inverting}
+Bipole paths can also mirrored and inverted (or reverted) to change the drawing direction.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -1338,30 +1435,37 @@
\begin{circuitikz}
\draw (0,0) to[pD, mirror] (2,0);
\end{circuitikz}
+\end{LTXexample}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[pD, invert] (2,0);
+\end{circuitikz}
\end{LTXexample}
-At the moment, placing labels and currents on mirrored bipoles works:
+Placing labels, currents and voltages works also, please note, that mirroring and inverting does not incfluence the positioning of labels and voltages. Labels are by default above/right of the bipole and voltages below/left, respectively.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[ospst=T] (2,0);
+ \draw (0,0) to[ospst=T, i=$i_1$, v=$v$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[ospst=T, mirror, i=$i_1$] (2,0);
+ \draw (0,0) to[ospst=T, mirror, i=$i_1$, v=$v$] (2,0);
\end{circuitikz}
\end{LTXexample}
-But voltages don't:
-
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
- \draw (0,0) to[ospst=T, mirror, v=v] (2,0);
+ \draw (0,0) to[ospst=T, invert, i=$i_1$, v=$v$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[ospst=T,mirror,invert, i=$i_1$, v=$v$] (2,0);
\end{circuitikz}
\end{LTXexample}
-Sorry about that.
\subsection{Putting them together}
\begin{LTXexample}[varwidth=true]
@@ -1378,10 +1482,26 @@
\end{circuitikz}
\end{LTXexample}
+\subsection{Line joins between Path Components}
+Line joins should be calculated correctly, if the were on the same path and if the path is not closed. For example, the following path is not closed correctly(\textit{--cycle} does not work here!):
+\begin{LTXexample}[varwidth=true]
+ \begin{tikzpicture}[line width=3pt,european]
+ \draw (0,0) to[R]++(2,0)to[R]++(0,2)
+ --++(-2,0)to[R]++(0,-2);
+ \draw[red,line width=1pt] circle(2mm);
+ \end{tikzpicture}
+\end{LTXexample}
+To correct the line ending, there are support shapes to fill the missing rectangle. They can be used like the support shapes(*,o,d) using a dot (.) on one or both ends of a component(have a look at the last resistor in this example:
+\begin{LTXexample}[varwidth=true]
+ \begin{tikzpicture}[line width=3pt,european]
+ \draw (0,0) to[R]++(2,0)to[R]++(0,2)
+ --++(-2,0)to[R,-.]++(0,-2);
+ \draw[red,line width=1pt] circle(2mm);
+ \end{tikzpicture}
+\end{LTXexample}
\section{Not only bipoles}
-
Since only bipoles (but see section~\ref{sec:transasbip}) can be placed "along a line", components with more than two terminals are placed as nodes:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -1446,7 +1566,7 @@
(pigfete.G) node[anchor=east] {G}
(pigfete.D) node[anchor=north] {D}
(pigfete.S) node[anchor=south] {S}
- (pigfete.bulk) node[anchor=east] {Bulk}
+ (pigfete.bulk) node[anchor=west] {Bulk}
;\end{circuitikz}
\end{LTXexample}
@@ -1506,7 +1626,7 @@
;\end{circuitikz}
\end{LTXexample}
-\begin{LTXexample}
+\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
\draw (0,2)
node[rground, yscale=-1] {}
@@ -2064,9 +2184,10 @@
\begin{tabular}{l}\label{ex:compatibility}
- \fbox{\includegraphics{compatibility.pdf}}
- \\
- \begin{lstlisting}
+\IfFileExists{compatibility.pdf}
+{\fbox{\includegraphics{compatibility.pdf}}}
+\\
+\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/circuitikz.doc.tlpobj new/tlpkg/tlpobj/circuitikz.doc.tlpobj
--- old/tlpkg/tlpobj/circuitikz.doc.tlpobj 2016-06-07 17:33:42.000000000 +0200
+++ new/tlpkg/tlpobj/circuitikz.doc.tlpobj 2017-06-06 02:21:51.000000000 +0200
@@ -1,9 +1,9 @@
name circuitikz.doc
category Package
-revision 41299
+revision 44488
shortdesc doc files of circuitikz
relocated 1
-docfiles size=93
+docfiles size=104
RELOC/doc/context/third/circuitikz/circuitikz-context.pdf
RELOC/doc/context/third/circuitikz/circuitikz-context.tex
RELOC/doc/generic/circuitikz/CHANGELOG.md
++++++ circuitikz.tar.xz ++++++
++++ 3790 lines of diff (skipped)
++++++ cite.doc.tar.xz ++++++
++++++ cite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cite.tlpobj new/tlpkg/tlpobj/cite.tlpobj
--- old/tlpkg/tlpobj/cite.tlpobj 2016-04-14 18:49:58.000000000 +0200
+++ new/tlpkg/tlpobj/cite.tlpobj 2017-04-14 17:35:04.000000000 +0200
@@ -16,7 +16,7 @@
RELOC/tex/latex/cite/overcite.sty
catalogue-also natbib
catalogue-ctan /macros/latex/contrib/cite
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics cite-supp
catalogue-version 5.5
++++++ citeall.doc.tar.xz ++++++
++++++ citeall.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/citeall.tlpobj new/tlpkg/tlpobj/citeall.tlpobj
--- old/tlpkg/tlpobj/citeall.tlpobj 2016-04-14 18:49:58.000000000 +0200
+++ new/tlpkg/tlpobj/citeall.tlpobj 2017-04-14 17:35:04.000000000 +0200
@@ -4,11 +4,11 @@
shortdesc Cite all entries of a bbl created with BibLaTeX
relocated 1
longdesc This small package allows to cite all entries of a bbl-file
-longdesc created with biblatex (v1.9).
+longdesc created with BibLaTeX (v1.9).
runfiles size=1
RELOC/tex/latex/citeall/citeall.sty
catalogue-ctan /macros/latex/contrib/biblatex-contrib/citeall
-catalogue-date 2015-08-03 08:55:55 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics biblatex
catalogue-version 1.2
++++++ cjhebrew.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cjhebrew/cjhebtst.tex new/doc/fonts/cjhebrew/cjhebtst.tex
--- old/doc/fonts/cjhebrew/cjhebtst.tex 2006-01-09 01:47:01.000000000 +0100
+++ new/doc/fonts/cjhebrew/cjhebtst.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage{german}
-\usepackage[T1]{fontenc}
-\usepackage{cjhebrew}
-
-\frenchspacing
-
-\newcommand{\cjh}{\textsf{cjhebrew}}
-
-\begin{document}
-
-\section*{Ein kleines \cjh-Beispieldokument}
-
-Das \cjh"=Paket erlaubt es, auf recht einfache Weise hebr"aischen
-Text zu setzen, und zwar insbesondere innerhalb von "`normalen"'
-Flie"stext. Wenn ich also nun einen beliebigen Vers aus dem
-Jeremiabuch einfach so hier einmal hinschreiben wollte, dann
-k"onnte ich das problemlos tun, etwa so: \ Hier zeigt
-sich auch gleich, wie der hebr"aische Text in der richtigen
-Schreibrichtung gesetzt und korrekt umbrochen wird.
-
-Hier folgt nun ein l"angerer hebr"aischer Text in erh"ohter
-Schriftgr"o"se, der auch zugleich die Verwendung von \verb+\cjLR+
-demonstriert:
-
-\def\vers#1{\cjLR{\rmfamily\normalsize#1}}
-
-\Large
-
-\begin{cjhebrew}
-
-\vers{1}~b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et
-hA'ArE.s; \vers{2}~w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk:
-`al--p*:ney t:hOm w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney
-ham*Ayim;
-
-\vers{3}~way*o'mEr 'E:lohiym y:hiy 'Or way:hiy--'Or;
-\vers{4}~way*ar:' 'E:lohiym 'Et--hA'Or k*iy--.tOb way*ab:d*el
-'E:lohiym b*eyn hA'Or Ubeyn ha.ho+sEk:; \vers{5}~way*iq:rA'
-'E:lohiym lA'Or yOm w:la.ho+sEk: qArA' lAy:lAh way:hiy--`ErEb
-way:hiy--boqEr yOm 'E.hAd;
-
-\end{cjhebrew}
-
-
-\end{document}
Binary files old/doc/fonts/cjhebrew/manual.pdf and new/doc/fonts/cjhebrew/manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/README new/doc/latex/cjhebrew/README
--- old/doc/latex/cjhebrew/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cjhebrew/README 2017-02-21 02:01:05.000000000 +0100
@@ -0,0 +1,4 @@
+cjhebrew is a small package for typesetting Hebrew text. It provides
+Type1 fonts containing the Hebrew consonants, Hebrew vowels and a few
+accents. It is meant to be used by people who want to insert short
+Hebrew texts into a non-Hebrew document.
\ No newline at end of file
Binary files old/doc/latex/cjhebrew/cjhebrew.pdf and new/doc/latex/cjhebrew/cjhebrew.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/cjhebrew.tex new/doc/latex/cjhebrew/cjhebrew.tex
--- old/doc/latex/cjhebrew/cjhebrew.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cjhebrew/cjhebrew.tex 2017-03-10 00:01:04.000000000 +0100
@@ -0,0 +1,324 @@
+% This file is part of the cjhebrew package
+%
+% cjhebrew is subject to the LaTeX Project Public License (LPPL).
+% A copy of the LPPL can be found in lppl.txt.
+% For the most recent version of this license have a look at
+%
+% http://www.latex-project.org/lppl.txt
+%
+\documentclass[a4paper,10pt]{article}
+\usepackage[english]{babel}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{cjhebrew}
+\usepackage{mathpazo}
+\usepackage[scaled=0.9]{helvet}
+\usepackage[scaled=0.8]{luximono}
+\usepackage[%
+ pdfauthor={Christian Justen},
+ pdftitle={The CJHebrew manual},
+ pdfborder={0 0 0},
+ bookmarksnumbered=true,
+ pdfpagemode=None,
+ pdfstartview=FitH,
+ ]%
+ {hyperref}
+\usepackage{booktabs}
+
+\frenchspacing
+
+\def\cjh{\textsf{cjhebrew}}
+
+\def\cjhp{\texttt{cjhebrew}}
+
+\def\!#1!{\texttt{#1}}
+
+\newcommand{\bs}{\textbackslash}
+
+\def\showmacro#1{\marginpar{\texttt{{\bs}#1}}}
+
+\def\showother#1{\marginpar{\texttt{#1}}}
+
+\def\cjhebversion{0.2a}
+
+\def\hinweis#1{\mbox{}\marginpar{\textsf{#1}}}
+
+\def\command#1{\medskip\par\texttt{#1}\medskip\par}
+
+\newcommand{\eTeX}{$\varepsilon$-\TeX}
+\newcommand{\eLaTeX}{$\varepsilon$-\LaTeX}
+
+\begin{document}
+
+\title{\cjh%
+ \footnote{\cjh\ is subject to the \textit{\LaTeX\ Project Public
+ License}. The most recent version of this license can be found at
+ \href{http://www.latex-project.org/lppl.txt}{\!www.latex-project.org/lppl.txt!}.}%
+}
+
+\author{Christian Justen\\
+\href{mailto:mail@christian-justen.de}{{\small\!mail@christian-justen.de!}}}
+
+\date{March 6\textsuperscript{th}, 2017 -- Version \cjhebversion}
+
+\maketitle
+
+
+\section{Overview}
+
+\cjh\ is a package which allows the typesetting of Hebrew text in
+\LaTeX\ documents. Hebrew text can be vocalised, also a few
+accents are available. \cjh\ makes it easy to insert Hebrew words,
+sentences or paragraphs into non-Hebrew text; so \cjh\ is quite
+appropriate e.\,g. for theological papers.
+
+When running \LaTeX, \cjh\ uses the extensions of \eTeX\ in order to
+typeset Hebrew text from right to left. Most modern \TeX\ systems use
+\eLaTeX\ by default when you run \LaTeX, so there should be nothing
+special you have to do (unless, of course, you fiddled with your
+system). This version of \cjh\ can also be used with lua\LaTeX.
+
+
+\section{Installation}
+
+\cjh\ is part of most modern \TeX\ distributions. Please, use your
+distribution's package manager to install \cjh. If no package manager
+is available, then have a look at your distribution's documentation,
+as it should tell you how to install packages manually.
+
+
+
+\section{Usage}
+
+To use \cjh\ simply put \verb!\usepackage{cjhebrew}! in the
+preamble of your document.
+
+\cjh\ provides the text font command
+\showmacro{textcjheb}\verb!\textcjheb! which switches to the hebrew
+font, but does not change the direction of typesetting. Thus, if you
+type \verb+\textcjheb{'bgd}+, the result will be \textcjheb{'bgd},
+which is in most cases not what you want. Instead you will normally
+use the command \showmacro{cjRL}\verb+\cjRL+, that also switches to
+the right direction of typesetting. The input \verb+\cjRL{'bgd}+ will
+have as result the ouput \cjRL{'bgd}. There is also an even shorter
+form: \showmacro{<>}\verb+\<>+; so, you can type \verb+\<'bgd>+
+instead of \verb+\cjRL{'bgd}+.
+
+If you want to typeset a complete passage of Hebrew text, you
+ought to use the \showother{cjhebrew}\!cjhebrew! environment.
+
+Finally, \cjh\ provides also the \verb+\cjLR+\showmacro{cjLR}
+command, which switches (inside a Hebrew piece of text) back to
+the ``normal'' direction of typesetting. Be careful: this command
+does not switch to a non-Hebrew font!
+
+\subsection{The consonants}
+
+\begin{table}
+
+\centering
+
+\begin{tabular}{ccccccccccccccc}
+
+\toprule\midrule
+
+\<'> & \<b> & \<g> & \<d> & \<h> & \<w> & \<z> & \<.h> &
+\<.t> & \<y> & \ & \<k> & \<l> & \ & \<m>\\
+
+\!'! & \!b! & \!g! & \!d! & \!h! & \!w! & \!z! & \!.h! & \!.t! &
+\!y! & \!k! & \!K! & \!l! & \!m! & \!M!\\
+
+\midrule
+
+\ & \<n> & \<s> & \<`> & \ & \<p> & \<.s|> & \<.s> & \<q>
+& \<r> & \</s>
+& \<,s> & \<+s> & \<t> &\\
+
+\!n! & \!N! & \!s! & \!`! & \!p! & \!P! & \!.s! & \!.S! & \!q! &
+\!r! & \!/s!
+& \!,s! & \!+s! & \!t! &\\
+
+\midrule\bottomrule
+
+\end{tabular}
+
+\medskip
+
+\textit{Note: \!'!~= semicolon, \!`!~= grave accent}
+
+\caption{Coding of the consonants}
+
+\label{coding:consonants}
+
+\end{table}
+
+How the Hebrew consonants are coded in your input file, is shown
+in table~\ref{coding:consonants}. Normally the final letters are
+used automatically; \verb+\<mlk>+ will become \<mlk>. Sometimes it
+is necessary to use final letters in places where they will not be
+set automatically, e.\,g. in the middle of a word. To do this you
+either use the coding according to table~\ref{coding:consonants}
+or you put an exclamation mark (\showother{!}\verb+!+) after the
+consonant; alternatively you can use the
+\showmacro{endofword}\verb+\endofword+ command. For example, a
+\textit{final mem} could be achieved by typing \verb+\<M>+,
+\verb+\+ or \verb+\+.
+
+On the other hand, sometimes you will not want this automatic
+replacement. In these cases you put \showother{|}\!|! after the
+consonant or use the \showmacro{zeronojoin}\verb+\zeronojoin+
+command. Both \verb+\+ and \verb+\+ will give
+you a normal \textit{mem}.
+
+\subsection{The vowels}
+
+\begin{table}
+
+\def\dc{\verb+\dottedcircle+}
+
+\centering
+
+\begin{tabular}{ccccccccccccccc}
+
+\toprule\midrule
+
+\<\dottedcircle i> & \<\dottedcircle e> & \<\dottedcircle E> &
+\<\dottedcircle E:> & \<\dottedcircle a> & \ &
+\<\dottedcircle a:> & \<\dottedcircle A> & \<\dottedcircle A:> &
+\<\dottedcircle o> & \<\dottedcircle u> &
+\<\dottedcircle *> & \<\dottedcircle :> & \<O> & \<U>\\
+
+\!i! & \!e! & \!E! & \!E:! & \!a! & \!/a! & \!a:! & \!A! & \!A:! &
+\!o! & \!u! & \!*! & \!:! & \!O! / \!wo! & \!U!
+/ \!w*!\\
+
+\midrule
+
+\<;> & \<--> & \<\dottedcircle> \\
+\!;! & \!-\/-! & \multicolumn{6}{l}{\texttt{\bs dottedcircle}}\\
+
+\midrule\bottomrule
+
+\end{tabular}
+
+\caption{Coding of the vowels, accents and symbols}
+
+\label{coding:vowels}
+
+\end{table}
+
+How to code the vowels in your input file is shown in
+table~\ref{coding:vowels}. The vowels have to be typed
+\textit{after} the consonant they belong to (for example
+\<'E:lohiym> is coded as \verb+\<'E:lohiym>+). The only exception
+is the \textit{pata\d{h} furtivum} as in \
+(\verb+\+). Always use \verb+*+ for \textit{dage\v{s}};
+\cjh\ does not distinguish between \textit{dage\v{s} lene} and
+\textit{dage\v{s} forte}. The \textit{dage\v{s}} has to follow its
+consonant \textit{immediately} (\verb+\+ becomes \),
+otherwise you will get a wrong result (\verb+\+ becomes
+\).
+
+\subsection{More accents and symbols}
+
+There are some more accents and symbols available, as shown in
+table~\ref{coding:vowels}. I hope to add some more in the future.
+
+
+\section{An example}
+
+Here is the beginning of the Bible:
+
+\bigskip
+
+\begin{cjhebrew}
+
+b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s;
+w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al--p*:ney t:hOm
+w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney ham*Ayim;
+
+\end{cjhebrew}
+
+\bigskip
+
+\bgroup
+
+\raggedright
+
+\verb+\begin{cjhebrew}+
+
+\!b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s;
+w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al-\/-p*:ney t:hOm
+w:rU/a.h 'E:lohiym m:ra.hEpEt `al-\/-p*:ney ham*Ayim;!
+
+\verb+\end{cjhebrew}+
+
+\egroup
+
+\section{What is new in this version?}
+
+\subsection*{v0.2a}
+
+\begin{itemize}
+\item Fixed a stupid typo which created a warning.
+\end{itemize}
+
+\subsection*{v 0.2}
+
+\begin{itemize}
+\item \cjh\ can now be used with lua\LaTeX. The neccessary code was
+ provided by Axel Kielhorn.
+\end{itemize}
+
+\subsection*{v 0.1a}
+
+\begin{itemize}
+
+ \item A typo in \!cjhebrew.sty! was corrected. It would cause
+ trouble if you used a Hebrew font in 7pt size or smaller.
+
+\end{itemize}
+
+
+\subsection*{v 0.1}
+
+\begin{itemize}
+
+ \item You can use \cjh\ now, even if \eLaTeX\ is not available
+ (but the Hebrew text will be typeset in the ``wrong''
+ direction, i.\,e. from left to right).%
+ \footnote{This feature was suggested by Malte
+ Rosenau.}
+
+ \item The documentation was rewritten. Instead of a German and
+ an English documentation there is now only this English
+ manual.
+
+ \item Some bugs in \!cjhebrew.sty! are fixed.\footnote{Thanks to Walter Schmidt.}
+
+ \item A problem with the letter ``qof'' is fixed (\
+ does not look \textit{that} good \ldots\ \qA:qE:qa: is much better).
+
+ \item There are also some changes regarding the font names and
+ the encoding. If you use an older version of
+ \cjh\ make sure that all old files are removed before you
+ install the new version!
+
+\end{itemize}
+
+Probably, some new bugs have crept into any new version. Please do
+report them as you discover them!
+
+
+\section{Finally}
+
+The version number of \cjh\ is \cjhebversion, it is far from being
+finished. Especially the fonts still need a lot of work; many
+letters look rather imperfect. If you have any ideas how to
+improve \cjh, please do send me an email.
+
+\end{document}
+
+% Local Variables:
+% coding: utf-8-unix
+% End:
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/cjhebtst.tex new/doc/latex/cjhebrew/cjhebtst.tex
--- old/doc/latex/cjhebrew/cjhebtst.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cjhebrew/cjhebtst.tex 2017-02-21 02:01:05.000000000 +0100
@@ -0,0 +1,48 @@
+\documentclass[a4paper]{article}
+\usepackage{german}
+\usepackage[T1]{fontenc}
+\usepackage{cjhebrew}
+
+\frenchspacing
+
+\newcommand{\cjh}{\textsf{cjhebrew}}
+
+\begin{document}
+
+\section*{Ein kleines \cjh-Beispieldokument}
+
+Das \cjh"=Paket erlaubt es, auf recht einfache Weise hebr"aischen
+Text zu setzen, und zwar insbesondere innerhalb von "`normalen"'
+Flie"stext. Wenn ich also nun einen beliebigen Vers aus dem
+Jeremiabuch einfach so hier einmal hinschreiben wollte, dann
+k"onnte ich das problemlos tun, etwa so: \ Hier zeigt
+sich auch gleich, wie der hebr"aische Text in der richtigen
+Schreibrichtung gesetzt und korrekt umbrochen wird.
+
+Hier folgt nun ein l"angerer hebr"aischer Text in erh"ohter
+Schriftgr"o"se, der auch zugleich die Verwendung von \verb+\cjLR+
+demonstriert:
+
+\def\vers#1{\cjLR{\rmfamily\normalsize#1}}
+
+\Large
+
+\begin{cjhebrew}
+
+\vers{1}~b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et
+hA'ArE.s; \vers{2}~w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk:
+`al--p*:ney t:hOm w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney
+ham*Ayim;
+
+\vers{3}~way*o'mEr 'E:lohiym y:hiy 'Or way:hiy--'Or;
+\vers{4}~way*ar:' 'E:lohiym 'Et--hA'Or k*iy--.tOb way*ab:d*el
+'E:lohiym b*eyn hA'Or Ubeyn ha.ho+sEk:; \vers{5}~way*iq:rA'
+'E:lohiym lA'Or yOm w:la.ho+sEk: qArA' lAy:lAh way:hiy--`ErEb
+way:hiy--boqEr yOm 'E.hAd;
+
+\end{cjhebrew}
+
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjhebrew.doc.tlpobj new/tlpkg/tlpobj/cjhebrew.doc.tlpobj
--- old/tlpkg/tlpobj/cjhebrew.doc.tlpobj 2016-04-14 18:49:58.000000000 +0200
+++ new/tlpkg/tlpobj/cjhebrew.doc.tlpobj 2017-04-14 17:35:04.000000000 +0200
@@ -1,8 +1,10 @@
name cjhebrew.doc
category Package
-revision 15878
+revision 43444
shortdesc doc files of cjhebrew
relocated 1
-docfiles size=29
- RELOC/doc/fonts/cjhebrew/cjhebtst.tex
- RELOC/doc/fonts/cjhebrew/manual.pdf
+docfiles size=32
+ RELOC/doc/latex/cjhebrew/README
+ RELOC/doc/latex/cjhebrew/cjhebrew.pdf
+ RELOC/doc/latex/cjhebrew/cjhebrew.tex
+ RELOC/doc/latex/cjhebrew/cjhebtst.tex
++++++ cjhebrew.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cjhebrew/cjhebrew.sty new/tex/latex/cjhebrew/cjhebrew.sty
--- old/tex/latex/cjhebrew/cjhebrew.sty 2007-03-07 19:11:00.000000000 +0100
+++ new/tex/latex/cjhebrew/cjhebrew.sty 2017-03-10 00:01:06.000000000 +0100
@@ -6,9 +6,11 @@
%
% http://www.latex-project.org/lppl.txt
%
+% Contains code provided by Axel Kielhorn (from lfgwluabidi.sty)
\ProvidesPackage{cjhebrew}
- [2004/08/27 v. 0.1a cjhebrew Hebrew Typesetting System]
+ [2017/03/06 v. 0.2a cjhebrew Hebrew Typesetting System]
+\RequirePackage{ifluatex}
\DeclareFontFamily{U}{cjheb}{}
@@ -27,20 +29,47 @@
\chardef\zeronojoin=124
\chardef\dottedcircle=203
-\@ifundefined{eTeXrevision}%
- {%
- \PackageWarningNoLine{cjhebrew}{\MessageBreak
- Hebrew text will be typeset from left to right!\MessageBreak
- You really should use e-TeX}
- \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup}
- \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup}
- \newenvironment{cjhebrew}{\cjhebfamily}{}
- }%
- {%
- \TeXXeTstate=1
- \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup}
- \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup}
- \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{}
- }
+\ifluatex
+ \RequirePackage{luabidi}
+
+ % The following lines patch luabidi.sty. As soon as luabidi.sty
+ % itself is patched, these lines can and should be removed.
+ \def\setRTLmain{\pagedir TRT \bodydir TRT \pardir TRT \textdir TRT}
+ \def\setRTL{\@RTLtrue\pardir TRT \textdir TRT}
+ \let\setRL=\setRTL
+ \def\setLTR{\@RTLfalse\pardir TLT \textdir TLT}
+ \let\setLR=\setLTR
+ \let\unsetRTL=\setLTR
+ \let\unsetLTR=\setRTL
+ \def\RTL{\@RTLtrue\trivlist \pardir TRT \textdir TRT\item\relax}
+ \def\LTR{\trivlist \pardir TLT \textdir TLT\item\relax}
+ \def\Footnote#1{%
+ \begingroup
+ \footnotemark
+ \renewcommand{\thefootnote}{\@arabic\c@footnote}%
+ \pardir TLT \textdir TLT\footnotetext{#1}%
+ \endgroup
+ }
+
+ \newcommand{\cjRL}[1]{\RLE{\textcjheb{#1\endofword}}}
+ \newcommand{\cjLR}[1]{\LRE{\textcjheb{\endofword#1}}}
+ \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\setRTL}{\unsetRTL}
+\else
+ \@ifundefined{eTeXrevision}%
+ {%
+ \PackageWarningNoLine{cjhebrew}{\MessageBreak
+ Hebrew text will be typeset from left to right!\MessageBreak
+ You really should use e-TeX}
+ \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup}
+ \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup}
+ \newenvironment{cjhebrew}{\cjhebfamily}{}
+ }%
+ {%
+ \TeXXeTstate=1
+ \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup}
+ \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup}
+ \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{}
+ }
+\fi
\def\<#1>{\cjRL{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjhebrew.tlpobj new/tlpkg/tlpobj/cjhebrew.tlpobj
--- old/tlpkg/tlpobj/cjhebrew.tlpobj 2016-04-14 18:49:59.000000000 +0200
+++ new/tlpkg/tlpobj/cjhebrew.tlpobj 2017-04-14 17:35:04.000000000 +0200
@@ -1,6 +1,6 @@
name cjhebrew
category Package
-revision 15878
+revision 43444
shortdesc Typeset Hebrew with LaTeX
relocated 1
longdesc The cjhebrew package provides Adobe Type 1 fonts for Hebrew,
@@ -27,7 +27,7 @@
RELOC/fonts/vf/public/cjhebrew/cjhbltx.vf
RELOC/tex/latex/cjhebrew/cjhebrew.sty
catalogue-ctan /language/hebrew/cjhebrew
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-03-09 19:41:20 +0100
catalogue-license lppl
catalogue-topics hebrew font font-type1 font-hebrew font-supp
-catalogue-version 0.1a
+catalogue-version 0.2a
++++++ cjk-gs-integrate.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
--- old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2016-01-15 23:58:54.000000000 +0100
+++ new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2017-05-06 00:45:42.000000000 +0200
@@ -1,6 +1,490 @@
+2017-05-05 Hironobu Yamashita
+
+ * Release 20170505.0 (HEAD -> master) [1f040e5]
+
+2017-05-05 Hironobu Yamashita
+
+ * snippets: %% -> %, %%%% -> %% seems enough (origin/master, origin/HEAD) [ba0b225]
+
+2017-05-05 Hironobu Yamashita
+
+ * help message: search paths all if available [727f51c]
+
+2017-05-05 Hironobu Yamashita
+
+ * update README.md from source [61ca8ec]
+
+2017-05-05 Hironobu Yamashita
+
+ * Merge branch 'win32-support' [a8528dc]
+
+2017-05-05 Hironobu Yamashita
+
+ * fix a mistake, adjust help message for search path (origin/win32-support, win32-support) [8fd2c88]
+
+2017-05-02 Hironobu Yamashita
+
+ * more TODO for win32 [b2d0cf5]
+
+2017-05-02 Hironobu Yamashita
+
+ * the order of option declaration [584c0d5]
+
+2017-05-02 Hironobu Yamashita
+
+ * throw an error for machine-readable alone [bbbd319]
+
+2017-04-29 Hironobu Yamashita
+
+ * file check [0cf210f]
+
+2017-04-27 Hironobu Yamashita
+
+ * fix a mistake in previous commit [e73ca96]
+
+2017-04-27 Hironobu Yamashita
+
+ * ensure new line when adding .runlibfile line [d12f6bb]
+
+2017-04-27 Hironobu Yamashita
+
+ * more chinese/korean database from debian packages [cf306ed]
+
+2017-04-26 Hironobu Yamashita
+
+ * comment [78cd68b]
+
+2017-04-26 Hironobu Yamashita
+
+ * default to symlink for win32, add --hardlink option [bd87af7]
+
+2017-04-25 Hironobu Yamashita
+
+ * change output to lib/ for tlgs, winbatch instruction [aebfd74]
+
+2017-04-25 Hironobu Yamashita
+
+ * tweaked [f487ab8]
+
+2017-04-24 Hironobu Yamashita
+
+ * symplify code for Encode::decode -> Encode::encode chain [ca81c6f]
+
+2017-04-22 Hironobu Yamashita
+
+ * simplify code [b2c9c77]
+
+2017-04-22 Hironobu Yamashita
+
+ * database sync [6ebc456]
+
+2017-04-22 Hironobu Yamashita
+
+ * Determine tlgs or native-gs (work in progress) [2eb249a]
+
+2017-04-15 Hironobu Yamashita
+
+ * better aliases [362084c]
+
+2017-03-22 Hironobu Yamashita
+
+ * typo in previous commit [092b662]
+
+2017-03-22 Hironobu Yamashita
+
+ * Add --winbatch option [cea39ee]
+
+2017-03-17 Norbert Preining
+
+ * add a TODO concerning symlink generation on Windows [ab4a6ca]
+
+2017-03-17 Norbert Preining
+
+ * simplify code [c755d0f]
+
+2017-03-18 Hironobu Yamashita
+
+ * Add more database for Mac [3254356]
+
+2017-03-18 Hironobu Yamashita
+
+ * Forgotten fonts for Mac OS X 10.7.5 (Lion) [f8de6fa]
+
+2017-03-17 Hironobu Yamashita
+
+ * Add more database for Office for Mac 2016 [0b9f826]
+
+2017-03-17 Hironobu Yamashita
+
+ * Support for Office for Mac 2016 search path (typo) [8460b62]
+
+2017-03-17 Hironobu Yamashita
+
+ * Support for Office for Mac 2016 search path [4db0f57]
+
+2017-03-17 Hironobu Yamashita
+
+ * Add database for Office for Mac 2016, MSOffice 2010 [86fce22]
+
+2017-03-09 Hironobu Yamashita
+
+ * More database for win32 [901274f]
+
+2017-03-09 Norbert Preining
+
+ * Release 20170309.0 (tag: 20170309.0) [8ce526f]
+
+2017-03-07 Hironobu Yamashita
+
+ * Update wrt. master [6503d0e]
+
+2017-03-07 Hironobu Yamashita
+
+ * comment (origin/hira-aliases) [efcd6ec]
+
+2017-03-07 Hironobu Yamashita
+
+ * Fix for Hiragino aliases (#23) [b1fb331]
+
+2017-03-03 Hironobu Yamashita
+
+ * Hiragino aliases (gs9.20 without OTC support) [1c494b6]
+
+2017-03-03 Hironobu Yamashita
+
+ * bug fix for morisawa aliases [bcbce0c]
+
+2017-02-24 Norbert Preining
+
+ * update release script for CTAN location [f2ae343]
+
+2017-02-20 Norbert Preining
+
+ * Release 20170220.0 (tag: 20170220.0) [4997503]
+
+2017-02-20 Norbert Preining
+
+ * update copyright [a865618]
+
+2017-02-20 Norbert Preining
+
+ * update README.md from source [a22f890]
+
+2017-02-08 Hironobu Yamashita
+
+ * alias priority: New priority for Simplified/Traditional Chinese [4f02658]
+
+2017-02-08 Hironobu Yamashita
+
+ * alias priority: Kozuka before Yu, Adobe before Solaris [4b3e12c]
+
+2017-02-08 Hironobu Yamashita
+
+ * Fix for priority numbers (#12) [97b0c63]
+
+2017-01-18 Hironobu Yamashita
+
+ * Support for ptex-fontmaps 20170114.0 (ume, yu etc.) [cd91c2f]
+
+2017-01-14 Hironobu Yamashita
+
+ * Win32 support: symlink/unlink consistency, quote [0445c18]
+
+2017-01-14 Hironobu Yamashita
+
+ * Win32 support: encode/decode (cp932 <=> utf8) [6e51c3d]
+
+2017-01-14 Hironobu Yamashita
+
+ * Reduce file open/close (again) [5c7e946]
+
+2017-01-13 Hironobu Yamashita
+
+ * Add data for psnames-for-otf also for aliases [5142e98]
+
+2017-01-12 Hironobu Yamashita
+
+ * better code [d439cac]
+
+2017-01-12 Hironobu Yamashita
+
+ * Reduce file open/close for winbatch and otfps [6cff16a]
+
+2016-12-29 aminophen
+
+ * Add fandol database (typo) [7c15bdf]
+
+2016-12-29 aminophen
+
+ * Add fandol database [1de88ed]
+
+2016-12-24 aminophen
+
+ * Generate psnames-for-otf only when --otfps is given [a1fbdb3]
+
+2016-12-23 aminophen
+
+ * Experiment for supporting win32 (again) [ba45bee]
+
+2016-12-23 aminophen
+
+ * Experiment for supporting win32 [2846489]
+
+2016-12-14 Norbert Preining
+
+ * fix indentation, add better explanation for case-insensitve problem [b73e45b]
+
+2016-12-14 Norbert Preining
+
+ * update README.md with the changes included recently [0330718]
+
+2016-12-14 aminophen
+
+ * Add moga-mobo database [de56b28]
+
+2016-12-14 Norbert Preining
+
+ * Merge pull request #20 from aminophen/ttc-ttf-otc [72cc9f1]
+
+2016-12-13 aminophen
+
+ * Fix for Name entry different from PSName [fcd2515]
+
+2016-12-13 aminophen
+
+ * Complete TTC/OTC database (thanks to @doraTeX) [67a90e3]
+
+2016-12-12 aminophen
+
+ * Parse 'Filename:' entry for backward compatibility [ce22753]
+
+2016-12-12 aminophen
+
+ * Show subfont number only when TTC/OTC (even zero) [4ea9cab]
+
+2016-12-12 aminophen
+
+ * Fix typo in d3ad4b4 [515e303]
+
+2016-12-12 aminophen
+
+ * Do not use OTC font as aliases [780f3b2]
+
+2016-12-12 aminophen
+
+ * Forgotten initialization [ebb6326]
+
+2016-12-12 aminophen
+
+ * Separate OTC/TTC/TTF (experiment) [d3ad4b4]
+
+2016-12-10 Yusuke Terada
+
+ * Merge pull request #19 from doraTeX/master [3db9b75]
+
+2016-12-10 doraTeX
+
+ * Revert unintended Unicode normalization [83267e7]
+
+2016-12-10 Yusuke Terada
+
+ * Merge pull request #18 from doraTeX/master [2666a1d]
+
+2016-12-10 Yusuke Terada
+
+ * cjk-gs-integrate.pl: Fix regex for /bin/gs [2e5d027]
+
+2016-12-10 doraTeX
+
+ * cjk-gs-integrate.pl: Fix regex for /bin/gs [a41ddd0]
+
+2016-12-09 aminophen
+
+ * cjk-gs-integrate.pl: change ttfname -> ttname [9bdfd20]
+
+2016-12-06 aminophen
+
+ * Fix a mistake in previous commit [daf1c07]
+
+2016-12-06 aminophen
+
+ * cjk-gs-integrate.pl: more database (CJK-Unifonts) [513d8b1]
+
+2016-12-05 aminophen
+
+ * Merge branch 'master' of https://github.com/texjporg/cjk-gs-support [ceb9542]
+
+2016-12-05 aminophen
+
+ * cjk-gs-integrate.pl: more database (arphic) [33b19ff]
+
+2016-12-05 Norbert Preining
+
+ * adjust header for copyright and url [4da74ae]
+
+2016-12-03 aminophen
+
+ * Fix for texjporg/jfontmaps#6 (second attempt) [2374e0c]
+
+2016-12-03 aminophen
+
+ * More .gitignore [e3f323e]
+
+2016-12-02 aminophen
+
+ * cjk-gs-integrate.pl: Fix for database [ec61fef]
+
+2016-10-26 Norbert Preining
+
+ * Release 20161026.0 (tag: 20161026.0) [af37d2e]
+
+2016-10-26 Norbert Preining
+
+ * Merge pull request #16 from aminophen/master [480b932]
+
+2016-10-26 aminophen
+
+ * Finished macOS Sierra CJK font database. [7763ba6]
+
+2016-10-07 Norbert Preining
+
+ * Merge pull request #15 from aminophen/master [5c852da]
+
+2016-10-05 aminophen
+
+ * Small fix for comments (thanks to @doraTeX) [40017a9]
+
+2016-10-05 aminophen
+
+ * Add CK font list (partial) [90fae6c]
+
+2016-10-04 aminophen
+
+ * Add macOS Sierra fonts (Japan) [003e010]
+
+2016-10-02 Norbert Preining
+
+ * add Yamashita-san to help and README [9fb17a2]
+
+2016-10-02 Norbert Preining
+
+ * Merge pull request #14 from aminophen/master [8c8e81e]
+
+2016-10-02 aminophen
+
+ * Add more korean fonts, priority settings [9de8aca]
+
+2016-10-02 aminophen
+
+ * Add more korean fonts, priority settings [db77c33]
+
+2016-10-02 aminophen
+
+ * small fixups [dfaf936]
+
+2016-10-02 aminophen
+
+ * small fixups [206ffec]
+
+2016-10-02 aminophen
+
+ * restore previous code [ed5c381]
+
+2016-10-01 Norbert Preining
+
+ * small fixups [38a2059]
+
+2016-10-01 Norbert Preining
+
+ * Merge pull request #13 from aminophen/gsres [9f702b2]
+
+2016-10-01 aminophen
+
+ * Directory check [4845c37]
+
+2016-10-01 aminophen
+
+ * Assume relative path of gs-resource [8e54dc3]
+
+2016-09-29 Norbert Preining
+
+ * update copyright year [df1fd69]
+
+2016-09-29 Norbert Preining
+
+ * Merge pull request #11 from aminophen/master [5993098]
+
+2016-09-29 aminophen
+
+ * Add baekmuk (korean) -- now the lowest priority [e6edb62]
+
+2016-09-29 Norbert Preining
+
+ * Merge pull request #10 from aminophen/master [0171ef8]
+
+2016-09-28 aminophen
+
+ * Use 'sep' instead of ':' [f87a35b]
+
+2016-09-27 aminophen
+
+ * Workaround (not setting OPENTYPEFONTS/TTFONTS explicitly) [7d0f926]
+
+2016-09-27 aminophen
+
+ * Fix a mistake [10e8fd0]
+
+2016-09-27 aminophen
+
+ * Special name (IPAMincho.ttf etc) not needed [ffd8e79]
+
+2016-09-27 Norbert Preining
+
+ * Merge pull request #8 from aminophen/master [2619378]
+
+2016-09-26 aminophen
+
+ * Prevent ttc -> ttf symlink (Songti/STSong, Kaiti/STKaiti) [043feee]
+
+2016-09-25 aminophen
+
+ * TODO: comment about wrong symlink [3009288]
+
+2016-09-24 aminophen
+
+ * Fix for STHeiti family [91455e9]
+
+2016-09-24 aminophen
+
+ * cleanup [7b0d0e3]
+
+2016-09-24 aminophen
+
+ * Add ipa-proportional database [548fa68]
+
+2016-09-24 aminophen
+
+ * Add yuwin10 fonts to yu-win database [e7acb2c]
+
+2016-09-24 aminophen
+
+ * Fix for hiragino database [805e1b1]
+
+2016-09-24 aminophen
+
+ * Fix morisawa database [68f500d]
+
+2016-09-23 aminophen
+
+ * typo [5d116a1]
+
+2016-09-23 aminophen
+
+ * Add /System/Library/Assets, /usr/share/fonts, recursive search [5b96e5a]
+
2016-01-15 Norbert Preining
- * Release 20160115.0 (HEAD -> master) [bfb2c76]
+ * Release 20160115.0 (tag: 20160115.0) [bfb2c76]
2016-01-15 Norbert Preining
@@ -16,7 +500,7 @@
2016-01-14 Norbert Preining
- * if --link-texmf is passed without argument use TEXMFLOCAL again (origin/master, origin/HEAD) [a4a8228]
+ * if --link-texmf is passed without argument use TEXMFLOCAL again [a4a8228]
2015-10-21 Norbert Preining
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md
--- old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2016-01-15 23:58:54.000000000 +0100
+++ new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2017-05-06 00:45:42.000000000 +0200
@@ -16,13 +16,11 @@
#### Options ####
`````
- -n, --dry-run do not actually output anything
- --remove try to remove instead of create
- -f, --fontdef FILE specify alternate set of font definitions, if not
- given, the built-in set is used
-o, --output DIR specifies the base output dir, if not provided,
the Resource directory of an installed GhostScript
is searched and used.
+ -f, --fontdef FILE specify alternate set of font definitions, if not
+ given, the built-in set is used
-a, --alias LL=RR defines an alias, or overrides a given alias;
illegal if LL is provided by a real font, or
RR is neither available as real font or alias;
@@ -34,14 +32,27 @@
and
DIR/fonts/truetype/cjk-gs-integrate
where DIR defaults to TEXMFLOCAL
- --machine-readable output of --list-aliases is machine readable
+ --otfps [DIR] generate configuration file (psnames-for-otf) into
+ DIR/dvips/ps2otfps
+ which is used by ps2otfps (developed by Akira Kakuto),
+ instead of generating snippets
--force do not bail out if linked fonts already exist
+ --remove try to remove instead of create
+ -n, --dry-run do not actually output anything
-q, --quiet be less verbose
-d, --debug output debug information, can be given multiple times
-v, --version outputs only the version information
-h, --help this help
`````
+#### Windows only options ####
+
+`````
+ --hardlink create hardlinks instead of symlinks
+ --winbatch prepare a batch file for link generation, instead of
+ generating links right away
+`````
+
#### Command like options ####
`````
@@ -52,6 +63,7 @@
present files
--list-fonts lists the fonts found on the system
--info combines the above two information
+ --machine-readable output of --list-aliases is machine readable
`````
Operation
@@ -60,6 +72,7 @@
For each found TrueType (TTF) font it creates a cidfmap entry in
<Resource>/Init/cidfmap.local
+ -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.local instead
and links the font to
@@ -79,10 +92,12 @@
Aliases are added to
<Resource>/Init/cidfmap.aliases
+ -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.aliases instead
Finally, it tries to add runlib calls to
<Resource>/Init/cidfmap
+ -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap
to load the cidfmap.local and cidfmap.aliases.
@@ -92,8 +107,13 @@
Search is done using the kpathsea library, in particular using kpsewhich
program. By default the following directories are searched:
- all TEXMF trees
- - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`,
- `/Network/Library/Fonts`, and `~/Library/Fonts` (all if available)
+ - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`,
+ `/System/Library/Assets`, `/Network/Library/Fonts`,
+ `~/Library/Fonts` and `/usr/share/fonts` (all if available)
+ - `/Applications/Microsoft Word.app/Contents/Resources/{Fonts,DFonts}`,
+ `/Applications/Microsoft Excel.app/Contents/Resources/{Fonts,DFonts}`,
+ `/Applications/Microsoft PowerPoint.app/Contents/Resources/{Fonts,DFonts}`
+ (all if available, meant for Office for Mac 2016)
- `c:/windows/fonts` (on Windows)
- the directories in `OSFONTDIR` environment variable
@@ -130,15 +150,16 @@
Korean:
- HYGoThic-Medium HYSMyeongJo-Medium
+ HYSMyeongJo-Medium HYGoThic-Medium HYRGoThic-Medium
Simplified Chinese:
STSong-Light STHeiti-Regular STHeiti-Light STKaiti-Regular
+ STFangsong-Light STFangsong-Regular
Traditional Chinese:
- MSung-Light MHei-Medium MKai-Medium
+ MSung-Light MSung-Medium MHei-Medium MKai-Medium
In addition, we also include provide entries for the OTF Morisawa names:
RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold
@@ -146,12 +167,22 @@
The order is determined by the Provides setting in the font database,
and for the Japanese fonts it is currently:
- Morisawa Pr6, Morisawa, Hiragino ProN, Hiragino,
- Yu OSX, Yu Win, Kozuka ProN, Kozuka, IPAex, IPA
+ Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino,
+ Kozuka Pr6N, Kozuka ProVI, Kozuka, Yu OSX, Yu Win,
+ MS, Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume
That is, the first font found in this order will be used to provide the
alias if necessary.
+For the Korean fonts:
+ (Hanyang,) Adobe, Solaris-hanyang, MS, Unfonts, Baekmuk
+
+For the Simplified Chinese:
+ Adobe, Fandol, Hiragino, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+
+For the Traditional Chinese:
+ Adobe, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+
#### Overriding aliases ####
Using the command line option `--alias LL=RR` one can add arbitrary aliases,
@@ -164,8 +195,8 @@
------------------------------------
The script and its documentation was written by Norbert Preining, based
-on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto
-and the TeX Q&A wiki page.
+on research and work by Yusuke Kuroki, Bruno Voisin, Hironobu Yamashita,
+Munehiro Yamamoto and the TeX Q&A wiki page.
The script is licensed under GNU General Public License Version 3 or later.
The contained font data is not copyrightable.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh
--- old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh 2015-05-06 06:50:06.000000000 +0200
+++ new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh 2017-05-06 00:45:42.000000000 +0200
@@ -295,17 +295,17 @@
local fontname=$1
local encode=$2
cat <http://mirror.ctan.org/tex-archive/macros/luatex/latex/cloze
+* Package page: https://www.ctan.org/pkg/cloze
+
# Repository
https://github.com/Josef-Friedrich/cloze
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/cloze/README.md new/doc/lualatex/cloze/README.md
--- old/doc/lualatex/cloze/README.md 2015-07-09 00:34:57.000000000 +0200
+++ new/doc/lualatex/cloze/README.md 2016-11-25 19:30:32.000000000 +0100
@@ -1,10 +1,10 @@
# Description
-EN: `cloze` is a LaTeX package to generate cloze. It uses the
+EN: `cloze` is a LuaLaTeX/LaTeX package to generate cloze. It uses the
capabilities of the modern TeX engine LuaTex.
-DE: `cloze` ist a LaTeX-Paket zum Erstellen von Lückentexten. Es nutzt
-die Möglichkeiten der modernen TeX-Engine LuaTeX.
+DE: `cloze` ist a LuaLaTeX/LaTeX-Paket zum Erstellen von Lückentexten.
+Es nutzt die Möglichkeiten der modernen TeX-Engine LuaTeX.
# License
@@ -20,6 +20,14 @@
and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.
+# CTAN
+
+Since July 2015 the cloze package is included in the Comprehensive TeX
+Archive Network (CTAN).
+
+* TeX archive: http://mirror.ctan.org/tex-archive/macros/luatex/latex/cloze
+* Package page: https://www.ctan.org/pkg/cloze
+
# Repository
https://github.com/Josef-Friedrich/cloze
Binary files old/doc/lualatex/cloze/cloze.pdf and new/doc/lualatex/cloze/cloze.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cloze.doc.tlpobj new/tlpkg/tlpobj/cloze.doc.tlpobj
--- old/tlpkg/tlpobj/cloze.doc.tlpobj 2016-04-14 18:50:15.000000000 +0200
+++ new/tlpkg/tlpobj/cloze.doc.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -1,9 +1,9 @@
name cloze.doc
category Package
-revision 37811
+revision 41531
shortdesc doc files of cloze
relocated 1
-docfiles size=44
+docfiles size=60
RELOC/doc/lualatex/cloze/README
RELOC/doc/lualatex/cloze/README.md
RELOC/doc/lualatex/cloze/cloze.pdf
++++++ cloze.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/cloze/cloze.lua new/scripts/cloze/cloze.lua
--- old/scripts/cloze/cloze.lua 2015-07-09 00:34:57.000000000 +0200
+++ new/scripts/cloze/cloze.lua 2016-11-25 19:32:52.000000000 +0100
@@ -25,6 +25,7 @@
registry.global_options = {}
registry.local_options = {}
local cloze = {}
+cloze.status = {}
local base = {}
base.is_registered = {}
function nodex.create_colorstack(data)
@@ -58,14 +59,29 @@
rule.width = width
return rule
end
-function nodex.insert_line(head, current, width)
- local n = {} -- node
- n.color_line = nodex.create_color('line')
- head, n.color_line = node.insert_after(head, current, n.color_line)
- n.line = nodex.create_line(width)
- head, n.line = node.insert_after(head, n.color_line, n.line)
- n.color_reset = nodex.create_color('reset')
- return node.insert_after(head, n.line, n.color_reset)
+function nodex.insert_list(position, current, list, head)
+ if not head then
+ head = current
+ end
+ for i, insert in ipairs(list) do
+ if position == 'after' then
+ head, current = node.insert_after(head, current, insert)
+ elseif position == 'before' then
+ head, current = node.insert_before(head, current, insert)
+ end
+ end
+ return current
+end
+function nodex.insert_line(current, width)
+ return nodex.insert_list(
+ 'after',
+ current,
+ {
+ nodex.create_color('line'),
+ nodex.create_line(width),
+ nodex.create_color('reset')
+ }
+ )
end
function nodex.write_line()
node.write(nodex.create_color('line'))
@@ -75,10 +91,8 @@
function nodex.create_linefil()
local glue = node.new('glue')
glue.subtype = 100
- local glue_spec = node.new('glue_spec')
- glue_spec.stretch = 65536
- glue_spec.stretch_order = 3
- glue.spec = glue_spec
+ glue.stretch = 65536
+ glue.stretch_order = 3
local rule = nodex.create_line(0)
rule.dir = 'TLT'
glue.leader = rule
@@ -106,6 +120,15 @@
local kern = nodex.create_kern(tex.sp(registry.get_value('margin')))
node.write(kern)
end
+function nodex.search_hlist(head)
+ while head do
+ if head.id == node.id('hlist') and head.subtype == 1 then
+ return nodex.strut_to_hlist(head)
+ end
+ head = head.next
+ end
+ return false
+end
function registry.create_marker(index)
local marker = node.new('whatsit','user_defined')
marker.type = 100 -- number
@@ -118,6 +141,15 @@
local marker = registry.create_marker(index)
node.write(marker)
end
+function registry.is_marker(item)
+ if item.id == node.id('whatsit')
+ and item.subtype == node.subtype('user_defined')
+ and item.user_id == registry.user_id then
+ return true
+ else
+ return false
+ end
+end
function registry.check_marker(item, mode, position)
local data = registry.get_marker_data(item)
if data and data.mode == mode and data.position == position then
@@ -140,7 +172,7 @@
end
function registry.get_marker_data(item)
if item.id == node.id('whatsit')
- and item.subtype == 44
+ and item.subtype == node.subtype('user_defined')
and item.user_id == registry.user_id then
return registry.get_storage(item.value)
else
@@ -152,6 +184,9 @@
registry.local_options = data.values
return data.values
end
+function registry.remove_marker(marker)
+ if registry.is_marker(marker) then node.remove(marker, marker) end
+end
function registry.get_index()
if not registry.index then
registry.index = 0
@@ -221,124 +256,151 @@
function registry.get_defaults(option)
return registry.defaults[option]
end
-function cloze.basic_make(head, hlist, start, stop)
+function cloze.basic_make(start, stop)
local n = {}
local l = {}
+ n.head = start
if not start or not stop then
return
end
n.start = start
n.stop = stop
l.width = node.dimensions(
- hlist.glue_set,
- hlist.glue_sign,
- hlist.glue_order,
+ cloze.status.hlist.glue_set,
+ cloze.status.hlist.glue_sign,
+ cloze.status.hlist.glue_order,
n.start,
n.stop
)
- head, n.line = nodex.insert_line(head, n.start, l.width)
- n.color_text = nodex.create_color('text')
- head, n.color_text = node.insert_after(
- hlist.head,
- n.line,
- n.color_text
- )
+ n.line = nodex.insert_line(n.start, l.width)
+ n.color_text = nodex.insert_list('after', n.line, {nodex.create_color('text')})
if registry.get_value_show() then
- n.kern = nodex.create_kern(-l.width)
- node.insert_after(head, n.color_text, n.kern)
- n.color_reset = nodex.create_color('reset')
- node.insert_after(head, n.stop, n.color_reset)
+ nodex.insert_list('after', n.color_text, {nodex.create_kern(-l.width)})
+ nodex.insert_list('before', n.stop, {nodex.create_color('reset')}, n.head)
else
n.line.next = n.stop.next
n.stop.prev = n.line.prev
end
-
+ registry.remove_marker(n.start)
+ registry.remove_marker(n.stop)
end
-function cloze.basic(head)
- local n = {} -- node
- local b = {} -- boolean
- local l = {} -- length
- local t = {} -- temp
- for hlist in node.traverse_id(node.id('hlist'), head) do
- hlist = nodex.strut_to_hlist(hlist)
- if b.line_end then
- b.init_cloze = true
+function cloze.basic_search_stop(head)
+ local stop
+ while head do
+ cloze.status.continue = true
+ stop = head
+ if registry.check_marker(stop, 'basic', 'stop') then
+ cloze.status.continue = false
+ break
end
- n.current = hlist.head
- while n.current do
- if
- registry.check_marker(n.current, 'basic', 'start')
- or
- b.init_cloze
- then
- b.init_cloze = false
- n.start = n.current
- while n.current do
- b.line_end = true
- n.stop = n.current
- if registry.check_marker(n.stop, 'basic', 'stop') then
- b.line_end = false
- break
- end
- n.current = n.current.next
- end
- cloze.basic_make(head, hlist, n.start, n.stop)
- n.current = n.stop
- else
- n.current = n.current.next
- end
+ head = head.next
+ end
+ return stop
+end
+function cloze.basic_search_start(head)
+ local start
+ local stop
+ local n = {}
+ if cloze.status.continue then
+ n.hlist = nodex.search_hlist(head)
+ if n.hlist then
+ cloze.status.hlist = n.hlist
+ start = cloze.status.hlist.head
end
+ elseif registry.check_marker(head, 'basic', 'start') then
+ start = head
end
+ if start then
+ stop = cloze.basic_search_stop(start)
+ cloze.basic_make(start, stop)
+ end
+end
+function cloze.basic_recursion(head)
+ while head do
+ if head.head then
+ cloze.status.hlist = head
+ cloze.basic_recursion(head.head)
+ else
+ cloze.basic_search_start(head)
+ end
+ head = head.next
+ end
+end
+function cloze.basic(head)
+ cloze.status.continue = false
+ cloze.basic_recursion(head)
return head
end
-function cloze.fix_make(head, start, stop)
- local l = {} -- length
+function cloze.fix_length(start, stop)
+ local l = {}
l.width = tex.sp(registry.get_value('width'))
- local n = {} -- node
- n.start = start
- n.stop = stop
- l.text_width = node.dimensions(n.start, n.stop)
- local align = registry.get_value('align')
- if align == 'right' then
- l.kern_start = -l.text_width
+ l.text_width = node.dimensions(start, stop)
+ l.align = registry.get_value('align')
+ if l.align == 'right' then
+ l.kern_start = - l.text_width
l.kern_stop = 0
- elseif align == 'center' then
+ elseif l.align == 'center' then
l.half = (l.width - l.text_width) / 2
- l.kern_start = -l.half - l.text_width
+ l.kern_start = - l.half - l.text_width
l.kern_stop = l.half
else
- l.kern_start = -l.width
+ l.kern_start = - l.width
l.kern_stop = l.width - l.text_width
end
- head, n.line = nodex.insert_line(head, n.start, l.width)
+ return l.width, l.kern_start, l.kern_stop
+end
+function cloze.fix_make(start, stop)
+ local l = {} -- length
+ local n = {} -- node
+ l.width, l.kern_start, l.kern_stop = cloze.fix_length(start, stop)
+ n.line = nodex.insert_line(start, l.width)
if registry.get_value_show() then
- n.kern_start = nodex.create_kern(l.kern_start)
- head, n.kern_start = node.insert_after(head, n.line, n.kern_start)
- n.color_text = nodex.create_color('text')
- node.insert_after(head, n.kern_start, n.color_text)
- n.color_reset = nodex.create_color('reset')
- node.insert_before(head, n.stop, n.color_reset)
- n.kern_stop = nodex.create_kern(l.kern_stop)
- node.insert_before(head, n.stop, n.kern_stop)
+ nodex.insert_list(
+ 'after',
+ n.line,
+ {
+ nodex.create_kern(l.kern_start),
+ nodex.create_color('text')
+ }
+ )
+ nodex.insert_list(
+ 'before',
+ stop,
+ {
+ nodex.create_color('reset'),
+ nodex.create_kern(l.kern_stop)
+ },
+ start
+ )
else
- n.line.next = n.stop.next
+ n.line.next = stop.next
end
+ registry.remove_marker(start)
+ registry.remove_marker(stop)
end
-function cloze.fix(head)
+function cloze.fix_recursion(head)
local n = {} -- node
n.start, n.stop = false
- for current in node.traverse_id(node.id('whatsit'), head) do
- if not n.start then
- n.start = registry.get_marker(current, 'fix', 'start')
- end
- if not n.stop then
- n.stop = registry.get_marker(current, 'fix', 'stop')
- end
- if n.start and n.stop then
- cloze.fix_make(head, n.start, n.stop)
- n.start, n.stop = false
+ while head do
+ if head.head then
+ cloze.fix_recursion(head.head)
+ else
+ if not n.start then
+ n.start = registry.get_marker(head, 'fix', 'start')
+ end
+ if not n.stop then
+ n.stop = registry.get_marker(head, 'fix', 'stop')
+ end
+ if n.start and n.stop then
+ cloze.fix_make(n.start, n.stop)
+ n.start, n.stop = false
+ end
end
+ head = head.next
end
+end
+function cloze.fix(head)
+ cloze.fix_recursion(head)
return head
end
function cloze.par(head)
@@ -350,15 +412,21 @@
end
l.width = hlist.width
hlist, n.strut, n.head = nodex.strut_to_hlist(hlist)
- head, n.line = nodex.insert_line(head, n.strut, l.width)
+ n.line = nodex.insert_line(n.strut, l.width)
if registry.get_value_show() then
- n.kern = nodex.create_kern(-l.width)
- head, n.kern = node.insert_after(head, n.line, n.kern)
- n.color_text = nodex.create_color('text')
- node.insert_after(head, n.kern, n.color_text)
- n.tail = node.tail(n.head)
- n.color_reset = nodex.create_color('reset')
- node.insert_after(n.head, n.tail, n.color_reset)
+ nodex.insert_list(
+ 'after',
+ n.line,
+ {
+ nodex.create_kern(-l.width),
+ nodex.create_color('text')
+ }
+ )
+ nodex.insert_list(
+ 'after',
+ node.tail(head),
+ {nodex.create_color('reset')}
+ )
else
n.line.next = nil
end
@@ -366,6 +434,7 @@
return head
end
function base.register(mode)
+ local basic
if mode == 'par' then
luatexbase.add_to_callback(
'post_linebreak_filter',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/cloze/cloze.sty new/tex/lualatex/cloze/cloze.sty
--- old/tex/lualatex/cloze/cloze.sty 2015-07-09 00:34:57.000000000 +0200
+++ new/tex/lualatex/cloze/cloze.sty 2016-11-25 19:34:04.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2015 by Josef Friedrich
+%% Copyright (C) 2015-2016 by Josef Friedrich
%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{cloze}
- [2015/07/08 v1.0 Package to typeset cloze worksheets or cloze tests]
+ [2016/06/23 v1.2 Package to typeset cloze worksheets or cloze tests]
\RequirePackage{fontspec,luatexbase-mcb,kvoptions,xcolor}
\directlua{
cloze = require('cloze')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cloze.tlpobj new/tlpkg/tlpobj/cloze.tlpobj
--- old/tlpkg/tlpobj/cloze.tlpobj 2016-04-14 18:50:16.000000000 +0200
+++ new/tlpkg/tlpobj/cloze.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -1,6 +1,6 @@
name cloze
category Package
-revision 37811
+revision 41531
shortdesc A LuaLaTeX package for creating cloze texts
relocated 1
longdesc This is a LuaLaTeX package for generating cloze texts. The main
@@ -8,11 +8,11 @@
longdesc when using the hide and show options. There are three commands
longdesc and one environment to generate cloze texts: the commands
longdesc \cloze, \clozefix, \clozefil, and the environment clozepar.
-runfiles size=4
+runfiles size=5
RELOC/scripts/cloze/cloze.lua
RELOC/tex/lualatex/cloze/cloze.sty
catalogue-ctan /macros/luatex/latex/cloze
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics exam luatex
-catalogue-version 1.0
+catalogue-version 1.2
++++++ clrscode.doc.tar.xz ++++++
++++++ clrscode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode.tlpobj new/tlpkg/tlpobj/clrscode.tlpobj
--- old/tlpkg/tlpobj/clrscode.tlpobj 2016-04-14 18:50:16.000000000 +0200
+++ new/tlpkg/tlpobj/clrscode.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/latex/clrscode/clrscode.sty
catalogue-also newalg clrscode3e
catalogue-ctan /macros/latex/contrib/clrscode
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pseudocode
catalogue-version 1.7
++++++ clrscode3e.doc.tar.xz ++++++
++++++ clrscode3e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode3e.tlpobj new/tlpkg/tlpobj/clrscode3e.tlpobj
--- old/tlpkg/tlpobj/clrscode3e.tlpobj 2016-04-14 18:50:16.000000000 +0200
+++ new/tlpkg/tlpobj/clrscode3e.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -13,6 +13,6 @@
RELOC/tex/latex/clrscode3e/clrscode3e.sty
catalogue-also newalg clrscode
catalogue-ctan /macros/latex/contrib/clrscode3e
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pseudocode
++++++ cm-lgc.doc.tar.xz ++++++
++++++ cm-lgc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm-lgc.tlpobj new/tlpkg/tlpobj/cm-lgc.tlpobj
--- old/tlpkg/tlpobj/cm-lgc.tlpobj 2016-04-14 18:50:17.000000000 +0200
+++ new/tlpkg/tlpobj/cm-lgc.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -661,7 +661,7 @@
RELOC/tex/latex/cm-lgc/ut1fcs.fd
RELOC/tex/latex/cm-lgc/ut1fct.fd
catalogue-ctan /fonts/ps-type1/cm-lgc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics font font-serif font-sans font-mono font-greek font-cyrillic font-type1 omega
catalogue-version 0.5
++++++ cm-super.doc.tar.xz ++++++
++++++ cm-super.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-e/cm-super.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/cm-super.tar.xz differ: char 27, line 1
++++++ cm-unicode.doc.tar.xz ++++++
++++++ cm-unicode.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-e/cm-unicode.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/cm-unicode.tar.xz differ: char 26, line 1
++++++ cm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm.doc.tlpobj new/tlpkg/tlpobj/cm.doc.tlpobj
--- old/tlpkg/tlpobj/cm.doc.tlpobj 2016-04-14 18:50:16.000000000 +0200
+++ new/tlpkg/tlpobj/cm.doc.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -1,6 +1,6 @@
name cm.doc
category Package
-revision 32865
+revision 42428
shortdesc doc files of cm
relocated 1
docfiles size=2
++++++ cm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm.tlpobj new/tlpkg/tlpobj/cm.tlpobj
--- old/tlpkg/tlpobj/cm.tlpobj 2016-04-14 18:50:16.000000000 +0200
+++ new/tlpkg/tlpobj/cm.tlpobj 2017-04-14 17:35:11.000000000 +0200
@@ -1,6 +1,6 @@
name cm
category Package
-revision 32865
+revision 42428
shortdesc Computer Modern fonts
relocated 1
longdesc Knuth's final iteration of his re-interpretation of a c.19
@@ -230,6 +230,6 @@
RELOC/fonts/tfm/public/cm/cmu10.tfm
RELOC/fonts/tfm/public/cm/cmvtt10.tfm
catalogue-ctan /fonts/cm
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license knuth
catalogue-topics font font-mf font-proportional font-mono font-cm
++++++ cmap.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmap.doc.tlpobj new/tlpkg/tlpobj/cmap.doc.tlpobj
--- old/tlpkg/tlpobj/cmap.doc.tlpobj 2016-05-16 00:50:34.000000000 +0200
+++ new/tlpkg/tlpobj/cmap.doc.tlpobj 2017-04-14 17:35:51.000000000 +0200
@@ -1,6 +1,6 @@
name cmap.doc
category Package
-revision 41168
+revision 42428
shortdesc doc files of cmap
relocated 1
docfiles size=2
++++++ cmap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmap.tlpobj new/tlpkg/tlpobj/cmap.tlpobj
--- old/tlpkg/tlpobj/cmap.tlpobj 2016-05-16 00:50:34.000000000 +0200
+++ new/tlpkg/tlpobj/cmap.tlpobj 2017-04-14 17:35:52.000000000 +0200
@@ -1,6 +1,6 @@
name cmap
category Package
-revision 41168
+revision 42428
shortdesc Make PDF files searchable and copyable
relocated 1
longdesc The cmap package provides character map tables, which make PDF
@@ -27,7 +27,7 @@
RELOC/tex/latex/cmap/t5.cmap
catalogue-also pdftex mmap
catalogue-ctan /macros/latex/contrib/cmap
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pdf-feat
catalogue-version 1.0h
++++++ cmarrows.doc.tar.xz ++++++
++++++ cmarrows.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmarrows.tlpobj new/tlpkg/tlpobj/cmarrows.tlpobj
--- old/tlpkg/tlpobj/cmarrows.tlpobj 2016-04-14 18:51:47.000000000 +0200
+++ new/tlpkg/tlpobj/cmarrows.tlpobj 2017-04-14 17:35:52.000000000 +0200
@@ -36,7 +36,7 @@
RELOC/metapost/cmarrows/tgbx0027.mp
catalogue-also pst-text
catalogue-ctan /graphics/metapost/contrib/macros/cmarrows
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-symb
catalogue-version 0.9
++++++ cmbright.doc.tar.xz ++++++
++++++ cmbright.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmbright.tlpobj new/tlpkg/tlpobj/cmbright.tlpobj
--- old/tlpkg/tlpobj/cmbright.tlpobj 2016-04-14 18:51:47.000000000 +0200
+++ new/tlpkg/tlpobj/cmbright.tlpobj 2017-04-14 17:35:52.000000000 +0200
@@ -190,7 +190,7 @@
RELOC/tex/latex/cmbright/ts1cmbr.fd
RELOC/tex/latex/cmbright/ts1cmtl.fd
catalogue-ctan /fonts/cmbright
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-maths font-sans font-mf
catalogue-version 8.1
++++++ cmcyr.doc.tar.xz ++++++
++++++ cmcyr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmcyr.tlpobj new/tlpkg/tlpobj/cmcyr.tlpobj
--- old/tlpkg/tlpobj/cmcyr.tlpobj 2016-04-14 18:51:48.000000000 +0200
+++ new/tlpkg/tlpobj/cmcyr.tlpobj 2017-04-14 17:35:52.000000000 +0200
@@ -719,6 +719,6 @@
RELOC/fonts/vf/public/cmcyr/ycmtt9.vf
RELOC/fonts/vf/public/cmcyr/ycmu10.vf
catalogue-ctan /fonts/cyrillic/cmcyr
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics font font-cyrillic font-type1 font-mf
++++++ cmdstring.doc.tar.xz ++++++
++++++ cmdstring.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmdstring.tlpobj new/tlpkg/tlpobj/cmdstring.tlpobj
--- old/tlpkg/tlpobj/cmdstring.tlpobj 2016-04-14 18:51:50.000000000 +0200
+++ new/tlpkg/tlpobj/cmdstring.tlpobj 2017-04-14 17:35:53.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/cmdstring/cmdstring.sty
catalogue-ctan /macros/latex/contrib/cmdstring
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics macro-supp
catalogue-version 1.1
++++++ cmdtrack.doc.tar.xz ++++++
++++++ cmdtrack.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmdtrack.tlpobj new/tlpkg/tlpobj/cmdtrack.tlpobj
--- old/tlpkg/tlpobj/cmdtrack.tlpobj 2016-04-14 18:51:51.000000000 +0200
+++ new/tlpkg/tlpobj/cmdtrack.tlpobj 2017-04-14 17:35:53.000000000 +0200
@@ -14,6 +14,6 @@
runfiles size=2
RELOC/tex/latex/cmdtrack/cmdtrack.sty
catalogue-ctan /macros/latex/contrib/cmdtrack
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1
catalogue-topics debug-supp
++++++ cmexb.doc.tar.xz ++++++
++++++ cmexb.tar.xz ++++++
++++++ cmextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmextra.tlpobj new/tlpkg/tlpobj/cmextra.tlpobj
--- old/tlpkg/tlpobj/cmextra.tlpobj 2016-04-14 18:51:51.000000000 +0200
+++ new/tlpkg/tlpobj/cmextra.tlpobj 2017-04-14 17:35:53.000000000 +0200
@@ -1,6 +1,6 @@
name cmextra
category Package
-revision 32831
+revision 42428
catalogue knuth-local
shortdesc Knuth's local information
relocated 1
@@ -56,6 +56,6 @@
RELOC/fonts/tfm/public/cmextra/gen8.tfm
RELOC/fonts/tfm/public/cmextra/gen9.tfm
catalogue-ctan /systems/knuth/local
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-01-28 12:48:42 +0100
catalogue-license knuth
catalogue-topics collection
++++++ cmll.doc.tar.xz ++++++
++++++ cmll.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmll.tlpobj new/tlpkg/tlpobj/cmll.tlpobj
--- old/tlpkg/tlpobj/cmll.tlpobj 2016-04-14 18:51:51.000000000 +0200
+++ new/tlpkg/tlpobj/cmll.tlpobj 2017-04-14 17:35:53.000000000 +0200
@@ -119,6 +119,6 @@
RELOC/tex/latex/cmll/ucmllss.fd
RELOC/tex/latex/cmll/ueull.fd
catalogue-ctan /fonts/cmll
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-maths font-mf font-type1
++++++ cmpica.doc.tar.xz ++++++
++++++ cmpica.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpica.tlpobj new/tlpkg/tlpobj/cmpica.tlpobj
--- old/tlpkg/tlpobj/cmpica.tlpobj 2016-04-14 18:51:52.000000000 +0200
+++ new/tlpkg/tlpobj/cmpica.tlpobj 2017-04-14 17:35:53.000000000 +0200
@@ -19,6 +19,6 @@
RELOC/fonts/tfm/public/cmpica/cmpicab.tfm
RELOC/fonts/tfm/public/cmpica/cmpicati.tfm
catalogue-ctan /fonts/cmpica
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics font font-mf
++++++ cmpj.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/README new/doc/latex/cmpj/README
--- old/doc/latex/cmpj/README 2014-03-24 21:41:22.000000000 +0100
+++ new/doc/latex/cmpj/README 2017-05-10 23:12:18.000000000 +0200
@@ -7,18 +7,23 @@
Files in this directory are:
- cmpj2.sty Condensed Matter Physics journal style file
- cmpj.sty Old version of the Condensed Matter Physics journal style file
+ cmpj3.sty Condensed Matter Physics journal style file v3.xx
+ cmpj2.sty Condensed Matter Physics journal style file v2.xx
+ cmpj.sty Condensed Matter Physics journal style file v1.xx
- cmp-logo.eps EPS and PDF versions of the CMP logo required
- cmp-logo.pdf by cmpj.sty and cmpj2.sty
+ cmp-logo.eps EPS and PDF versions of the CMP logo required
+ cmp-logo.pdf by cmpj?.sty
- cmpj.bst BibTeX style file for Condensed Matter Physics (experimental)
+ cmpj-cc-by-small.eps EPS and PDF versions of the CC-BY icon required
+ cmpj-cc-by-small.pdf by cmpj3.sty
- README This file
+ cmpj.bst BibTeX style file for Condensed Matter Physics (experimental)
+ cmpjxampl.bib Sample bibliography file
- userguide/* user guide and template for preparing articles for
- publishing in the Condensed Matter Physics journal
+ README This file
+
+ userguide/* user guide and template for preparing articles for
+ publishing in the Condensed Matter Physics journal
INSTALLATION
@@ -31,10 +36,13 @@
3. Move files to a directories on your LaTeX input path. Recommended TDS
location, for modern freeware installations of LaTeX, is
<local texmf tree>/tex/latex/cmpj/ for
+ cmpj3.sty
cmpj2.sty
cmpj.sty
cmp-logo.eps
cmp-logo.pdf
+ cmpj-cc-by-small.eps
+ cmpj-cc-by-small.pdf
files, <local texmf tree>/bibtex/bst/cmpj/ for
cmpj.bst
file, and <local texmf tree>/doc/latex/cmpj/ for
@@ -44,6 +52,7 @@
eps_demo.pdf
icmphome.eps
icmphome.pdf
+ cmpjxampl.bib
README
files.
@@ -55,12 +64,14 @@
ADDITIONAL FILES REQUIRED BY THIS PACKAGE
-cmpj.sty and cmpj2.sty require the 'doi', 'fancyhdr', 'graphicx',
-'hyperref', 'ifthen', 'url', and 'natbib' packages.
+cmpj?.sty require the 'doi', 'fancyhdr', 'graphicx', 'hyperref',
+'ifthen', 'url', and 'natbib' packages.
These packages are included in the current LaTeX distributions.
They are also available at CTAN (http://www.ctan.org/).
-Besides, cmpj2.sty supports the 'droid' fonts for text
-and 'fourier' and 'txfonts' for math.
+cmpj2.sty supports the 'droid' fonts for text and 'fourier' and
+'txfonts' for math.
+cmpj3.sty supports the 'newtx' fonts for text and math and
+'droid' fonts for text sans-serif.
USER GUIDE AND TEMPLATE
@@ -74,6 +85,23 @@
CHANGES
+RELEASE NOTES FOR VERSION 3.01:
+
+* New cmpj3.sty using 'newtx' fonts for text and math and
+ 'droid' fonts for text sans-serif.
+
+* Added options 'cc-by' for Creative Commons Attribution 4.0 International
+ License (default) and 'no-cc' for author retained copyright (obsolete).
+
+* doi.sty code, modified to follow the CrossRef DOI display guidelines,
+ is incorporated in cmpj3.sty.
+
+* Updated cmpj.bst.
+
+* Some minor changes in the cmpj2.sty code.
+
+* Updated user guide and template.
+
RELEASE NOTES FOR VERSION 2.05:
* Corrected equation numbering in the appendixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/cmpjxampl.bib new/doc/latex/cmpj/cmpjxampl.bib
--- old/doc/latex/cmpj/cmpjxampl.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cmpj/cmpjxampl.bib 2017-05-10 23:12:18.000000000 +0200
@@ -0,0 +1,151 @@
+@Book{Zub74,
+author = {Zubarev, D. N.},
+title = {Nonequilibrium Statistical Thermodynamics},
+publisher = {Consultants Bureau},
+year = {1974},
+address = {New-York},
+numpages = {489},
+}
+
+@article{Bus89,
+ title = {Possibility of a common origin to ferroelectricity and superconductivity in oxides},
+ author = {Bussmann-Holder, A. and Simon, A. and B\"uttner, H.},
+ journal = {Phys. Rev. B},
+ volume = {39},
+ issue = {1},
+ pages = {207--214},
+ numpages = {0},
+ year = {1989},
+ month = {Jan},
+ publisher = {American Physical Society},
+ doi = {10.1103/PhysRevB.39.207},
+ OPTurl = {https://link.aps.org/doi/10.1103/PhysRevB.39.207}
+}
+
+@Article{Mel00,
+ author="Melnyk, R. S.
+ and Patsahan, O. V.",
+ title="Vapor-liquid critical-point properties of a symmetric binary fluid mixture",
+ journal="Theor. Math. Phys.",
+ year="2000",
+ volume="124",
+ number="2",
+ pages="1145--1156",
+ abstract="We propose a microscopic approach for investigating the behavior of a symmetric binary fluid mixture in the vicinity of the vapor-liquid critical point. The problem can be reduced to calculating the partition function of a 3D Ising model in an external field. For a square-well symmetric binary mixture, we express the parameters of the critical point as functions of the microscopic parameter r measuring the relative strength of interactions between the particles of dissimilar and similar species. The calculations are performed at intermediate ($\lambda$=1.5) and moderately long ($\lambda$=2) intermolecular potential ranges. The obtained results agree well with the results of computer simulations.",
+ issn="1573-9333",
+ doi="10.1007/BF02551084",
+ OPTurl="http://dx.doi.org/10.1007/BF02551084",
+ note = {[Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 339--352 (in Russian), \bibdoi{10.4213/tmf643}]},
+}
+
+@Article{Mry94,
+author = {Mryglod, I. M. and Tokarchuk, M. V.},
+title = {Hydrodynamic theory of a magnetic liquid},
+journal = {Condens. Matter Phys.},
+year = {1994},
+volume = {3},
+pages = {116-133},
+doi = {10.5488/CMP.3.116},
+}
+
+@Article{Sta11,
+author = {Stasyuk, I. V. and Velychko, O. V.},
+title = {Two-state {B}ose-{H}ubbard model in the hard-core boson limit},
+journal = {Condens. Matter Phys.},
+year = {2011},
+volume = {14},
+number = {1},
+pages = {13004},
+eid = {13004},
+numpages = {14},
+doi = {10.5488/CMP.14.13004},
+}
+
+@TechReport{Sta04,
+ author = {Stasyuk, I. V. and Mysakovych, T. S.},
+ OPTtitle = {Raman scattering in systems with locally anharmonic elements of structure},
+ year = {2004},
+ type = {Preprint of the Institute for Condensed Matter Physics},
+ number = {ICMP--04--12U},
+ address = {Lviv},
+ OPTinstitution = {Inst. Condens. Matter Phys.},
+ note = {(in Ukrainian)},
+}
+
+@Article{Scient2012,
+ author="Mryglod, O.
+ and Kenna, R.
+ and Holovatch, {\relax Yu}rij
+ and Berche, B.",
+ title="Absolute and specific measures of research group excellence",
+ journal="Scientometrics",
+ year="2013",
+ OPTvolume="95",
+ OPTnumber="1",
+ OPTpages="115--127",
+ abstract="A desirable goal of scientific management is to introduce, if it exists, a simple and reliable way to measure the scientific excellence of publicly funded research institutions and universities to serve as a basis for their ranking and financing. While citation-based indicators and metrics are easily accessible, they are far from being universally accepted as way to automate or inform evaluation processes or to replace evaluations based on peer review. Here we consider absolute measurements of research excellence at an amalgamated, institutional level and specific measures of research excellence as performance per head. Using biology research institutions in the UK as a test case, we examine the correlations between peer review-based and citation-based measures of research excellence on these two scales. We find that citation-based indicators are very highly correlated with peer-evaluated measures of group strength, but are poorly correlated with group quality. Thus, and almost paradoxically, our analysis indicates that citation counts could possibly form a basis for deciding on, how to fund research institutions, but they should not be used as a basis for ranking them in terms of quality.",
+ issn="1588-2861",
+ doi="10.1007/s11192-012-0874-7",
+ OPTurl="http://dx.doi.org/10.1007/s11192-012-0874-7",
+ note="(in press)",
+}
+
+@book{Abr64,
+title = {Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical Tables},
+series = {National Bureau of Standards Applied Mathematics Series},
+editor = {Abramovitz, M. and Stegun, I. A.},
+volume = {55},
+publisher = {U.S. Government Printing Office, Washington, D.C.},
+year = {1964},
+}
+
+@incollection{Olver64,
+author = {Olver, F. W. J.},
+title = {Bessel functions of integer order},
+booktitle = {Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical Tables},
+series = {National Bureau of Standards Applied Mathematics Series},
+editor = {Abramovitz, M. and I. A. Stegun},
+volume = {55},
+publisher = {U.S. Government Printing Office, Washington, D.C.},
+year = {1964},
+pages = {355-434},
+}
+
+@InCollection{Yuk87,
+ author = {Yukhnovkii, I. R. and Idzyk, I. M. and Kolomiets, V. O.},
+ title = {Critical point of the liquid-gas system},
+ booktitle = {Proceedings of the Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987)},
+ pages = {97-102},
+ year = {1987},
+ volume = {2},
+ address = {Kiev},
+ publisher = {Naukova Dumka},
+ month = {3--5 February},
+ note = {(in Russian)},
+}
+
+@article{Shv04,
+ author = {Shvaika, A. M. and Vorobyov, O. and Freericks, J. K. and Devereaux, T. P.},
+ OPTtitle = {Electronic {R}aman scattering in correlated materials: exact treatment of nonresonant, mixed, and resonant scattering with dynamical mean field theory},
+ journal = {Preprint \arxiv{cond-mat/0408400}},
+ OPTeprint = {cond-mat/0408400},
+ OPTarchive = {arXiv},
+ year = {2004},
+}
+
+@Misc{url2,
+ OPTkey = {key},
+ OPTauthor = {author},
+ title = {{EOSDIS} {W}orldview. {C}ity {L}ights},
+ OPThowpublished = {howpublished},
+ OPTmonth = {month},
+ OPTyear = {year},
+ OPTnote = {note},
+ OPTannote = {annote},
+ url={http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic},
+}
+
+@misc{han12,
+ author = {Han, Y. and Kida, T. and Ikeda, M. and Hagiwara, M. and Stre\v{c}ka, J. and Honda, Z.},
+ note = {(unpublished)},
+}
Binary files old/doc/latex/cmpj/template.pdf and new/doc/latex/cmpj/template.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/template.tex new/doc/latex/cmpj/template.tex
--- old/doc/latex/cmpj/template.tex 2014-03-24 21:41:22.000000000 +0100
+++ new/doc/latex/cmpj/template.tex 2017-05-10 23:12:18.000000000 +0200
@@ -6,9 +6,9 @@
%%% in the Condensed Matter Physics journal %%%
%%% using LaTeX2e %%%
%%% %%%
-%%% Last time modified: March 23, 2014 %%%
+%%% Last time modified: May 8, 2017 %%%
%%% %%%
-%%% Copyright (C) 2014 by the Institute for Condensed Matter Physics %%%
+%%% Copyright (C) 2017 by the Institute for Condensed Matter Physics %%%
%%% of the National Academy of Sciences of Ukraine %%%
%%% %%%
%%% This file can be redistributed and/or modified under the terms %%%
@@ -20,26 +20,36 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[intlimits,twoside,a4paper]{article}
-\usepackage{amsmath,amssymb}
-\usepackage{graphicx}
+%%%% \usepackage{amsmath,amssymb} %%%% already in cmpj3.sty
+%%%% \usepackage{graphicx} %%%% already in cmpj3.sty
-\usepackage[T2A]{fontenc}
+%%%% \usepackage{bm} %%%% place it below \usepackage{cmpj3}
+
+%%%% \usepackage[T2A,T1]{fontenc} %%%% already in cmpj3.sty
\usepackage[cp1251]{inputenc}
%
-%% Support for Ukrainian language. Comment two lines above if you do
-%% not use Ukrainian.
+%% Support for Ukrainian language. Comment line above if you do
+%% not use Ukrainian. In the main body, use commands \textcyrrm, \textcyrsf and \textcyrtt
+%% to typeset in cyrillic script.
-\usepackage[eqsecnum]{cmpj2}
+\usepackage[eqsecnum]{cmpj3}
%% Fields in square brackets are optional.
%% Use 'eqsecnum' for equation numbering by sections;
%% and 'preprint' for the preprint layout with the increased
%% font size and interline spacing.
%%
%% Other options control font schema (not required for regular usage):
-%% 'droid' for droid fonts (default);
+%% 'newtx' for newtx fonts (default);
+%% 'droid' for droid fonts as in 'cmpj2.sty';
%% 'helvet' for Helvetica fonts as in old 'cmpj.sty';
-%% 'cm' for standard TeX Computer Modern fonts.
+%% 'cm' for standard TeX Computer Modern fonts,
+%% and copyright/licensing status:
+%% 'cc-by' for Creative Commons Attribution 4.0 International License (default);
+%% 'no-cc' for author retained copyright (obsolete);
+%% 'nocopyright' for Editorials, etc.
+
+\usepackage{bm}
\articletype{Regular article}
@@ -81,7 +91,7 @@
\begin{abstract}
These instructions describe how to prepare and submit an article
-using \LaTeX{} and \texttt{cmpj2.sty} for publishing in
+using \LaTeX{} and \texttt{cmpj3.sty} for publishing in
``Condensed Matter Physics'' journal. Each submitted manuscript
should contain an abstract reflecting the essence of the study.
The abstract will be published separately from the article in a
@@ -94,7 +104,7 @@
discouraged. Please define all nonstandard symbols and
abbreviations.
%
-\keywords Up to six keywords
+\keywords Up to six keywords (\href{https://physh.aps.org/browse}{Physics Subject Headings})
%
\pacs Up to six PACS numbers
\end{abstract}
@@ -204,10 +214,14 @@
written as a single paragraph. Mathematical expressions
should be avoided.
-Up to six keywords should at a glance give a general idea of the
+Up to six keywords (Physics Subject Headings)
+\\ [1ex]
+\centerline{\texttt{\url{https://physh.aps.org/browse}}}
+\\ [1ex]
+should at a glance give a general idea of the
article to a reader. PACS numbers (up to six classification codes)
\emph{must} be given.
-Please use the full, permanently updated classification system which
+Please use the full classification system which
is available online at
\\ [1ex]
\centerline{\texttt{\url{http://journals.aps.org/PACS/}}}
@@ -291,12 +305,12 @@
but only the \LaTeX{} environments, so that the document style
determines the formula layout. For example, the definition of
Dirac $\delta$-function in the Fourier representation looks like
-\begin{equation}
+\begin{align}
\label{delta-def}
-\delta(x) = \frac{1}{2\pi}
+\delta(x) = \frac{1}{2\uppi}
\int_{-\infty}^{\infty} \re^{\ri sx}
\rd s,
-\end{equation}
+\end{align}
where the expression $\re^{\ri sx}$ is tolerable but the exponents
with more complex arguments should be replaced by $\exp({\ri sx})$.
For displayed multi-line formulas use the standard \verb|eqnarray|
@@ -333,7 +347,7 @@
unit ($\ri=\sqrt{-1}$), differential ``$\rd$'', and
the operators ``$\Im$'' and ``$\Re$'' for the
imaginary and real parts of complex numbers, respectively [see
-equation~(\ref{delta-def}) for example] and \verb|cmpj.sty| provides
+equation~(\ref{delta-def}) for example] and \verb|cmpj3.sty| provides
commands \verb|\re|, \verb|\ri|, \verb|\rd|, \verb|\Im|, and \verb|\Re|
for typesetting such symbols, respectively.
@@ -361,7 +375,6 @@
should avoid.
\begin{itemize}
%
-%
\item
%
For simple fractions in the
@@ -376,7 +389,6 @@
where possible; the construction $(\ldots)^{-1}$ should be used
instead.
%
-%
\item
%
Angle brackets (e.g. the ``bra-ket'' notation, average values and
@@ -384,7 +396,6 @@
$\langle p|q \rangle$, $\langle S^z \rangle$ and
$\langle\langle a_i | a^{\dag}_j \rangle\rangle_{\omega}$.
%
-%
\item
%
The symbol \verb|\mid| should be used as binary operator only.
@@ -392,13 +403,11 @@
as modulus, the ``bra-ket'' notation and Green functions:
$X^{pq}= |p\rangle \langle q|$ and $A=|b/c|$.
%
-%
\item
%
The root sign $\sqrt[n]{x}$ looks fine with simple expressions only,
the power $1/n$ should be used for complex ones.
%
-%
\item
%
Braces, brackets and parentheses should be used in
@@ -406,11 +415,13 @@
should be used within each size. However, this ordering can be
ignored if the brackets have a special meaning.
%
-%
\item
%
Decimal point (not comma!) should be used in decimal fractions.
%
+\item
+%
+Do not use obsolete commands \verb|\rm|, \verb|\bf|, \verb|\sf|, etc., for font switching, use \verb|\textrm|, \verb|\textbf|, \verb|\textsf|, etc., instead.
%
\item
%
@@ -528,6 +539,7 @@
Lettering should not be pasted on to the figures as it may easily
become detached as a result of handling.
+
Colour figures submitted in electronic format will generally
remain in colour in the electronic versions of an article at no
cost. However, in the paper version of the CMP journal figures are
@@ -637,9 +649,9 @@
e.g. in Ukrainian, unpublished, private communication, in press) \cite{Bus89,Mel00,Mry94,Sta11}.
For journals without volume numbers place the issue number instead as in reference~\cite{Mry94}.
The names of all authors of cited papers should be given.
-Title of journal should be abbreviated according to the ISI standards (see \texttt{\url{http://library.caltech.edu/reference/abbreviations/}}).
+Title of journal should be abbreviated according to the ISO~4 ``\href{http://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{http://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{http://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles).
Please supply \href{http://www.crossref.org/guestquery/}{DOI} for
-e-version of the papers if available \cite{Bus89,Mel00,Sta11,Scient2012}.
+e-version of the papers if available \cite{Bus89,Mel00,Mry94,Sta11,Scient2012}.
For books, the following order is required (skip irrelevant information):
Book Authors, Book Title. Book Series Vol. No., Editor(s) (Ed[s].),
@@ -653,9 +665,9 @@
publications by adding ``(in press)'' \cite{Scient2012}. If a preprint
exists of the paper not yet accepted for publication, give the e-print
\href{http://arxiv.org}{arXiv} number \cite{Shv04}.
-Any web resources should be cited as references \cite{url1,url2,url3}.
+Any web resources should be cited as references \cite{url2}.
Please avoid references to unpublished materials, private communication
-and web pages \cite{han12,url1,url2,url3}.
+and web pages \cite{han12,url2}.
It is important to confirm the accuracy of bibliographic information
in references. This has become more important now that the journal
@@ -667,45 +679,43 @@
you have checked your paper for any relevant references you may have missed.
A typical numerical reference list might be
-\cite{Zub74,Bus89,Mel00,Mry94,Sta11,Abr64,Olver64,Sta04,Shv04,Yuk87,han12,Scient2012,url1,url2}.
+\cite{Zub74,Bus89,Mel00,Mry94,Sta11,Abr64,Olver64,Sta04,Shv04,Yuk87,han12,Scient2012,url2}.
{\small \topsep 0.6ex
\begin{verbatim}
-\begin{thebibliography}{99}
-\bibitem{Zub74} Zubarev~D.N., Nonequilibrium Statistical Thermodynamics, Consultants
- Bureau, New-York, 1974.
-\bibitem{Bus89} Bussmann-Holder~A., Simon~A., B\"uttner~H., Phys. Rev. B, 1989,
- \textbf{39}, 207; \bibdoi{10.1103/PhysRevB.39.207}.
-\bibitem{Mel00} Melnyk~R., Patsahan~O., Theor. Math. Phys., 2000, \textbf{124}, 1145;
- \bibdoi{10.1007/BF02551084} [Teor. Mat. Fiz., 2000, \textbf{124}, 339 (in Russian);
- \bibdoi{10.4213/tmf643}].
-\bibitem{Mry94} Mryglod~I.M., Tokarchuk~M.V., Condens. Matter Phys., 1993, \textbf{3}, 116;
- \bibdoi{10.5488/CMP.3.116}.
-\bibitem{Sta11} Stasyuk~I.V., Velychko~O.V., Condens. Matter Phys., 2011, \textbf{14},
- 13004; \bibdoi{10.5488/CMP.14.13004}.
-\bibitem{Abr64} Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical
- Tables. National Bureau of Standards Applied Mathematics Series Vol.~55, Abramovitz~M.,
- Stegun~I.A. (Eds.), U.S. Government Printing Office, Washington, D.C., 1964.
-\bibitem{Olver64} Olver~F.W.J., In: Handbook of Mathematical Functions with Formulas,
- Graphs, and Mathematical Tables. National Bureau of Standards Applied Mathematics
- Series Vol.~55, Abramovitz~M., Stegun~I.A. (Eds.), U.S. Government Printing Office,
- Washington, D.C., 1964, 355--434.
-\bibitem{Scient2012} Mryglod~O., Kenna~R., Holovatch~Yu., Berche~B.,
- Scientometrics (in press); \bibdoi{10.1007/s11192-012-0874-7}.
-\bibitem{Sta04} Stasyuk~I.V., Mysakovych~T.S., Preprint of the Institute for Condensed
- Matter Physics, ICMP--04--12U, Lviv, 2004 (in Ukrainian).
-\bibitem{Shv04} Shvaika~A.M., Vorobyov~O., Freericks~J.K., Devereaux~T.P.,
- Preprint \arxiv{cond-mat/0408400}, 2004.
-\bibitem{Yuk87} Yukhnovkii~I.R., Idzyk~I.M., Kolomiets~V.O.,
- In: Proceedings of the Conference ``Modern Problems of Statistical Physics''
- (Lviv, 1987), Vol.~2, Naukova Dumka, Kiev, 1987, 97--102 (in Russian).
-\bibitem{han12} Han~Y., Kida~T., Ikeda~M., Hagiwara~M., Stre\v{c}ka~J., Honda~Z.
- (unpublished).
-\bibitem{url1} \url{http://en.wikipedia.org/wiki/Condensed_matter_physics}.
-\bibitem{url2} \url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
-\bibitem{url3} \href{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}
- {EOSDIS Worldview. City Lights}.
+\begin{thebibliography}{10}
+\bibitem{Zub74} Zubarev D.N., Nonequilibrium Statistical Thermodynamics, Consultants
+ Bureau, New-York, 1974.
+\bibitem{Bus89} Bussmann-Holder A., Simon A., B\"uttner H., Phys. Rev. B, 1989,
+ \textbf{39}, 207--214, \doi{10.1103/PhysRevB.39.207}.
+\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2,
+ 1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2,
+ 339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3},
+ 116--133, \doi{10.5488/CMP.3.116}.
+\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14},
+ No.~1, 13004 (14 pages), \doi{10.5488/CMP.14.13004}.
+\bibitem{Sta04} Stasyuk I.V., Mysakovych T.S., Preprint of the Institute for Condensed
+ Matter Physics, ICMP--04--12U, Lviv, 2004, (in Ukrainian).
+\bibitem{Scient2012} Mryglod O., Kenna R., Holovatch Yu., Berche B., Scientometrics, 2013,
+ \doi{10.1007/s11192-012-0874-7}, (in press).
+\bibitem{Abr64} Abramovitz M., Stegun I.A. (Eds.), Handbook of Mathematical Functions with
+ Formulas, Graphs, and Mathematical Tables, National Bureau of Standards Applied
+ Mathematics Series, Vol.~55, U.S. Government Printing Office, Washington, D.C., 1964.
+\bibitem{Olver64} Olver F.W.J., In: Handbook of Mathematical Functions with Formulas,
+ Graphs, and Mathematical Tables, National Bureau of Standards Applied Mathematics
+ Series, Vol.~55, Abramovitz M., Stegun I.A. (Eds.), U.S. Government Printing Office,
+ Washington, D.C., 1964, 355--434.
+\bibitem{Yuk87} Yukhnovkii I.R., Idzyk I.M., Kolomiets V.O., In: Proceedings of the
+ Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987), Vol.~2, Naukova
+ Dumka, Kiev, 1987, 97--102, (in Russian).
+\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P.,Preprint
+ \arxiv{cond-mat/0408400}, 2004.
+\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
+ URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
+\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z.,
+ (unpublished).
\end{thebibliography}
\end{verbatim}
}
@@ -759,10 +769,10 @@
Frequently good physicists (especially young scientists) have a
little knowledge how to write a good looking article. As
comprehensive (and free) tutorials on the subject one can mention
-``IOP Style Guide''
-\\ [1ex]
-\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},}
-\\ [1ex]
+%``IOP Style Guide''
+%\\ [1ex]
+%\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},}
+%\\ [1ex]
``Physical Review Style and Notation Guide''
\\ [1ex]
\centerline{\texttt{\url{http://publish.aps.org/files/styleguide-pr.pdf}},}
@@ -779,43 +789,39 @@
%% or create them from your bibtex database using cmpj.bst style (experimental).
%\bibliographystyle{cmpj}
-%\bibliography{mybibdb}
-
+%\bibliography{cmpjxampl}
-\begin{thebibliography}{99}
-\bibitem{Zub74} Zubarev~D.N., Nonequilibrium Statistical Thermodynamics, Consultants
- Bureau, New-York, 1974.
-\bibitem{Bus89} Bussmann-Holder~A., Simon~A., B\"uttner~H., Phys. Rev. B, 1989,
- \textbf{39}, 207; \bibdoi{10.1103/PhysRevB.39.207}.
-\bibitem{Mel00} Melnyk~R., Patsahan~O., Theor. Math. Phys., 2000, \textbf{124}, 1145;
- \bibdoi{10.1007/BF02551084} [Teor. Mat. Fiz., 2000, \textbf{124}, 339 (in Russian);
- \bibdoi{10.4213/tmf643}].
-\bibitem{Mry94} Mryglod~I.M., Tokarchuk~M.V., Condens. Matter Phys., 1993, \textbf{3}, 116;
- \bibdoi{10.5488/CMP.3.116}.
-\bibitem{Sta11} Stasyuk~I.V., Velychko~O.V., Condens. Matter Phys., 2011, \textbf{14},
- 13004; \bibdoi{10.5488/CMP.14.13004}.
-\bibitem{Abr64} Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical
- Tables. National Bureau of Standards Applied Mathematics Series Vol.~55, Abramovitz~M.,
- Stegun~I.A. (Eds.), U.S. Government Printing Office, Washington, D.C., 1964.
-\bibitem{Olver64} Olver~F.W.J., In: Handbook of Mathematical Functions with Formulas,
- Graphs, and Mathematical Tables. National Bureau of Standards Applied Mathematics
- Series Vol.~55, Abramovitz~M., Stegun~I.A. (Eds.), U.S. Government Printing Office,
- Washington, D.C., 1964, 355--434.
-\bibitem{Scient2012} Mryglod~O., Kenna~R., Holovatch~Yu., Berche~B.,
- Scientometrics (in press); \bibdoi{10.1007/s11192-012-0874-7}.
-\bibitem{Sta04} Stasyuk~I.V., Mysakovych~T.S., Preprint of the Institute for Condensed
- Matter Physics, ICMP--04--12U, Lviv, 2004 (in Ukrainian).
-\bibitem{Shv04} Shvaika~A.M., Vorobyov~O., Freericks~J.K., Devereaux~T.P.,
- Preprint \arxiv{cond-mat/0408400}, 2004.
-\bibitem{Yuk87} Yukhnovkii~I.R., Idzyk~I.M., Kolomiets~V.O.,
- In: Proceedings of the Conference ``Modern Problems of Statistical Physics''
- (Lviv, 1987), Vol.~2, Naukova Dumka, Kiev, 1987, 97--102 (in Russian).
-\bibitem{han12} Han~Y., Kida~T., Ikeda~M., Hagiwara~M., Stre\v{c}ka~J., Honda~Z.
- (unpublished).
-\bibitem{url1} \url{http://en.wikipedia.org/wiki/Condensed_matter_physics}.
-\bibitem{url2} \url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
-\bibitem{url3} \href{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}
-{EOSDIS Worldview. City Lights}.
+\begin{thebibliography}{10}
+\bibitem{Zub74} Zubarev D.N., Nonequilibrium Statistical Thermodynamics, Consultants Bureau,
+ New-York, 1974.
+\bibitem{Bus89} Bussmann-Holder A., Simon A., B\"uttner H., Phys. Rev. B, 1989, \textbf{39},
+ 207--214, \doi{10.1103/PhysRevB.39.207}.
+\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2,
+ 1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2,
+ 339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3},
+ 116--133, \doi{10.5488/CMP.3.116}.
+\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14},
+ No.~1, 13004 (14 pages), \doi{10.5488/CMP.14.13004}.
+\bibitem{Sta04} Stasyuk I.V., Mysakovych T.S., Preprint of the Institute for Condensed Matter
+ Physics, ICMP--04--12U, Lviv, 2004, (in Ukrainian).
+\bibitem{Scient2012} Mryglod O., Kenna R., Holovatch Yu., Berche B., Scientometrics, 2013,
+ \doi{10.1007/s11192-012-0874-7}, (in press).
+\bibitem{Abr64} Abramovitz M., Stegun I.A. (Eds.), Handbook of Mathematical Functions with
+ Formulas, Graphs, and Mathematical Tables, National Bureau of Standards Applied
+ Mathematics Series, Vol.~55, U.S. Government Printing Office, Washington, D.C., 1964.
+\bibitem{Olver64} Olver F.W.J., In: Handbook of Mathematical Functions with Formulas, Graphs,
+ and Mathematical Tables, National Bureau of Standards Applied Mathematics Series, Vol.~55,
+ Abramovitz M., Stegun I.A. (Eds.), U.S. Government Printing Office, Washington, D.C.,
+ 1964, 355--434.
+\bibitem{Yuk87} Yukhnovkii I.R., Idzyk I.M., Kolomiets V.O., In: Proceedings of the
+ Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987), Vol.~2, Naukova Dumka,
+ Kiev, 1987, 97--102, (in Russian).
+\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P., Preprint
+ \arxiv{cond-mat/0408400}, 2004.
+\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
+ URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
+\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., (unpublished).
\end{thebibliography}
%
@@ -846,7 +852,7 @@
\tolerance=3000%
� ��� ������� ������� �� ���������� �� ��������
������ ��� ��������� � ������ ``Condensed Matter Physics'' ��
-��������� \LaTeX{} � ������������� ����� \texttt{cmpj2.sty}.
+��������� \LaTeX{} � ������������� ����� \texttt{cmpj3.sty}.
����� ��������� ������� ������� ������ ��������, �� ��������
���� ����������. �������� ���������������� ������ �� ����� �
������������ ������������� ��������, ���� ���� ������ ����
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpj.doc.tlpobj new/tlpkg/tlpobj/cmpj.doc.tlpobj
--- old/tlpkg/tlpobj/cmpj.doc.tlpobj 2016-04-14 18:51:52.000000000 +0200
+++ new/tlpkg/tlpobj/cmpj.doc.tlpobj 2017-05-11 02:06:49.000000000 +0200
@@ -1,10 +1,11 @@
name cmpj.doc
category Package
-revision 33275
+revision 44283
shortdesc doc files of cmpj
relocated 1
-docfiles size=159
+docfiles size=172
RELOC/doc/latex/cmpj/README
+ RELOC/doc/latex/cmpj/cmpjxampl.bib
RELOC/doc/latex/cmpj/eps_demo.eps
RELOC/doc/latex/cmpj/eps_demo.pdf
RELOC/doc/latex/cmpj/icmphome.eps
++++++ cmpj.tar.xz ++++++
++++ 1826 lines of diff (skipped)
++++++ cmsd.doc.tar.xz ++++++
++++++ cmsd.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmsd.tlpobj new/tlpkg/tlpobj/cmsd.tlpobj
--- old/tlpkg/tlpobj/cmsd.tlpobj 2016-04-14 18:51:52.000000000 +0200
+++ new/tlpkg/tlpobj/cmsd.tlpobj 2017-04-14 17:35:54.000000000 +0200
@@ -18,6 +18,6 @@
RELOC/tex/latex/cmsd/t1cmsd.fd
RELOC/tex/latex/cmsd/ts1cmsd.fd
catalogue-ctan /macros/latex/contrib/cmsd
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp
++++++ cmtiup.doc.tar.xz ++++++
++++++ cmtiup.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmtiup.tlpobj new/tlpkg/tlpobj/cmtiup.tlpobj
--- old/tlpkg/tlpobj/cmtiup.tlpobj 2016-04-14 18:51:53.000000000 +0200
+++ new/tlpkg/tlpobj/cmtiup.tlpobj 2017-04-14 17:35:54.000000000 +0200
@@ -89,7 +89,7 @@
RELOC/tex/latex/cmtiup/cmtiup.sty
catalogue-also cmslup
catalogue-ctan /fonts/cm/cmtiup
-catalogue-date 2016-02-15 07:16:16 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics font font-virtual
catalogue-version 2.1
++++++ cnbwp.doc.tar.xz ++++++
++++++ cnbwp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cnbwp.tlpobj new/tlpkg/tlpobj/cnbwp.tlpobj
--- old/tlpkg/tlpobj/cnbwp.tlpobj 2016-04-14 18:51:54.000000000 +0200
+++ new/tlpkg/tlpobj/cnbwp.tlpobj 2017-04-14 17:35:54.000000000 +0200
@@ -13,6 +13,6 @@
RELOC/tex/latex/cnbwp/cnbwp.cls
RELOC/tex/latex/cnbwp/cnbwpsizes.clo
catalogue-ctan /macros/latex/contrib/cnbwp
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics misc-paper
++++++ cnltx.doc.tar.xz ++++++
++++++ cnltx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cnltx.tlpobj new/tlpkg/tlpobj/cnltx.tlpobj
--- old/tlpkg/tlpobj/cnltx.tlpobj 2016-04-14 18:51:54.000000000 +0200
+++ new/tlpkg/tlpobj/cnltx.tlpobj 2017-04-14 17:35:55.000000000 +0200
@@ -29,7 +29,7 @@
RELOC/tex/latex/cnltx/cnltx.dbx
RELOC/tex/latex/cnltx/cnltx.sty
catalogue-ctan /macros/latex/contrib/cnltx
-catalogue-date 2015-08-17 17:04:10 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics doc-supp class expl3
catalogue-version 0.13
++++++ cns.doc.tar.xz ++++++
++++++ cns.tar.xz ++++++
++++++ cntformats.doc.tar.xz ++++++
++++++ cntformats.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cntformats.tlpobj new/tlpkg/tlpobj/cntformats.tlpobj
--- old/tlpkg/tlpobj/cntformats.tlpobj 2016-04-14 18:52:10.000000000 +0200
+++ new/tlpkg/tlpobj/cntformats.tlpobj 2017-04-14 17:36:01.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=3
RELOC/tex/latex/cntformats/cntformats.sty
catalogue-ctan /macros/latex/contrib/cntformats
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics numbers
catalogue-version 0.7
++++++ cntperchap.doc.tar.xz ++++++
++++++ cntperchap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cntperchap.tlpobj new/tlpkg/tlpobj/cntperchap.tlpobj
--- old/tlpkg/tlpobj/cntperchap.tlpobj 2016-04-14 18:52:11.000000000 +0200
+++ new/tlpkg/tlpobj/cntperchap.tlpobj 2017-04-14 17:36:01.000000000 +0200
@@ -13,8 +13,9 @@
longdesc author) and xparse are needed as well.
runfiles size=3
RELOC/tex/latex/cntperchap/cntperchap.sty
+catalogue-also xcntperchap
catalogue-ctan /macros/latex/contrib/cntperchap
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics counter-mgmt macro-supp
catalogue-version 0.3
++++++ cochineal.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/README new/doc/fonts/cochineal/README
--- old/doc/fonts/cochineal/README 2016-04-07 22:50:07.000000000 +0200
+++ new/doc/fonts/cochineal/README 2017-03-12 01:01:03.000000000 +0100
@@ -19,7 +19,23 @@
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts.
-Current version: 1.01 2016-04-06
+Current version: 1.042 2017-03-10
+
+Changes in version 1.042
+Modified the sty file so that Cochineal text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
+
+Changes in version 1.041
+Added two entries to smcp table so that dotlessi and dotlessj map to correct small cap glyph.
+
+Changes in version 1.04
+Small modifications to sizes to provide better match across styles.
+
+Changes in version 1.03:
+1. Some modifications to a number of glyphs, spacing and kerning.
+2. Added uni2016---required for some footnote macros.
+
+Changes in version 1.02:
+Modified the {OT1,T1,LY1}Cochineal-{OsF,LF,TLF,TOsF}.fd files so that the swashQ tests work correctly even when cochineal.sty is not loaded.
Changes in version 1.01:
Corrected lgr encodings to replace Delta and Omega with uni0394 and uni03A9 respectively.
Binary files old/doc/fonts/cochineal/cochineal-doc.pdf and new/doc/fonts/cochineal/cochineal-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/cochineal-doc.tex new/doc/fonts/cochineal/cochineal-doc.tex
--- old/doc/fonts/cochineal/cochineal-doc.tex 2016-04-07 22:50:07.000000000 +0200
+++ new/doc/fonts/cochineal/cochineal-doc.tex 2017-03-12 01:01:03.000000000 +0100
@@ -48,8 +48,9 @@
\useosf % switch from lining figures to oldstyle figures
\useproportional % switch from tabular to proportional
\end{verbatim}
-There is a simpler way to achieve the same result though it conflicts with parts of the {\tt babel} package.
+There is a simpler way to achieve essentially the same result, but with the advantage that the figure styles are not loaded until after the math package (if any) is loaded, so that math always uses the default tabular lining figures.
\begin{verbatim}
+% If you use babel, load it here, before cochineal
\usepackage[p,osf]{cochineal} % default figure style is proportional, oldstyle
% load sans and typewriter fonts
% load a math font---it will use tabular lining figures in math
@@ -83,10 +84,11 @@
\begin{verbatim}
% preamble should include, in this order:
\usepackage[T1]{fontenc}
+% load babel here
\usepackage[p,osf]{cochineal}
\usepackage[varqu,varl,var0]{inconsolata}
\usepackage[scale=.95,type1]{cabin}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cochineal,vvarbb]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
\end{verbatim}
\def\Pr{\ensuremath{\mathbb{P}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cochineal.doc.tlpobj new/tlpkg/tlpobj/cochineal.doc.tlpobj
--- old/tlpkg/tlpobj/cochineal.doc.tlpobj 2016-04-14 18:52:11.000000000 +0200
+++ new/tlpkg/tlpobj/cochineal.doc.tlpobj 2017-04-14 17:36:01.000000000 +0200
@@ -1,9 +1,9 @@
name cochineal.doc
category Package
-revision 40321
+revision 43462
shortdesc doc files of cochineal
relocated 1
-docfiles size=89
+docfiles size=91
RELOC/doc/fonts/cochineal/OFL-FAQ.txt
RELOC/doc/fonts/cochineal/OFL.txt
RELOC/doc/fonts/cochineal/README
++++++ cochineal.tar.xz ++++++
++++ 276133 lines of diff (skipped)
++++++ codedoc.doc.tar.xz ++++++
++++++ codedoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codedoc.tlpobj new/tlpkg/tlpobj/codedoc.tlpobj
--- old/tlpkg/tlpobj/codedoc.tlpobj 2016-04-14 18:52:32.000000000 +0200
+++ new/tlpkg/tlpobj/codedoc.tlpobj 2017-04-14 17:36:09.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/latex/codedoc/codedoc.cls
catalogue-also doc gmdoc
catalogue-ctan /macros/latex/contrib/codedoc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics doc-supp
catalogue-version 0.3
++++++ codepage.doc.tar.xz ++++++
++++++ codepage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codepage.tlpobj new/tlpkg/tlpobj/codepage.tlpobj
--- old/tlpkg/tlpobj/codepage.tlpobj 2016-04-14 18:52:33.000000000 +0200
+++ new/tlpkg/tlpobj/codepage.tlpobj 2017-04-14 17:36:09.000000000 +0200
@@ -16,6 +16,6 @@
RELOC/tex/latex/codepage/shapecm.tex
RELOC/tex/latex/codepage/shapedc.tex
catalogue-ctan /macros/latex/contrib/codepage
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics inputenc
++++++ codesection.doc.tar.xz ++++++
++++++ codesection.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codesection.tlpobj new/tlpkg/tlpobj/codesection.tlpobj
--- old/tlpkg/tlpobj/codesection.tlpobj 2016-04-14 18:52:33.000000000 +0200
+++ new/tlpkg/tlpobj/codesection.tlpobj 2017-04-14 17:36:09.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/latex/codesection/codesection.sty
catalogue-also comment optional version
catalogue-ctan /macros/latex/contrib/codesection
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cond-comp
catalogue-version 0.1
++++++ codicefiscaleitaliano.doc.tar.xz ++++++
++++++ codicefiscaleitaliano.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj new/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj
--- old/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj 2016-04-14 18:52:33.000000000 +0200
+++ new/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj 2017-04-14 17:36:09.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=1
RELOC/tex/latex/codicefiscaleitaliano/codicefiscaleitaliano.sty
catalogue-ctan /macros/latex/contrib/codicefiscaleitaliano
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics calculation italian
catalogue-version 1.2
++++++ collcell.doc.tar.xz ++++++
++++++ collcell.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collcell.tlpobj new/tlpkg/tlpobj/collcell.tlpobj
--- old/tlpkg/tlpobj/collcell.tlpobj 2016-04-14 18:52:34.000000000 +0200
+++ new/tlpkg/tlpobj/collcell.tlpobj 2017-04-14 17:36:10.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/collcell/collcell.sty
catalogue-ctan /macros/latex/contrib/collcell
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics table
catalogue-version 0.5
++++++ collectbox.doc.tar.xz ++++++
++++++ collectbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collectbox.tlpobj new/tlpkg/tlpobj/collectbox.tlpobj
--- old/tlpkg/tlpobj/collectbox.tlpobj 2016-04-14 18:52:34.000000000 +0200
+++ new/tlpkg/tlpobj/collectbox.tlpobj 2017-04-14 17:36:10.000000000 +0200
@@ -16,7 +16,7 @@
runfiles size=3
RELOC/tex/latex/collectbox/collectbox.sty
catalogue-ctan /macros/latex/contrib/collectbox
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics boxing
catalogue-version 0.4b
++++++ collref.doc.tar.xz ++++++
++++++ collref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collref.tlpobj new/tlpkg/tlpobj/collref.tlpobj
--- old/tlpkg/tlpobj/collref.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/collref.tlpobj 2017-04-14 17:36:10.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/collref/collref.sty
catalogue-also mcite
catalogue-ctan /macros/latex/contrib/collref
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cite-supp
catalogue-version 2.0b
++++++ colordoc.doc.tar.xz ++++++
++++++ colordoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colordoc.tlpobj new/tlpkg/tlpobj/colordoc.tlpobj
--- old/tlpkg/tlpobj/colordoc.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colordoc.tlpobj 2017-04-14 17:36:10.000000000 +0200
@@ -14,6 +14,6 @@
runfiles size=2
RELOC/tex/latex/colordoc/colordoc.sty
catalogue-ctan /macros/latex/contrib/colordoc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1
catalogue-topics doc-supp
++++++ colorinfo.doc.tar.xz ++++++
++++++ colorinfo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorinfo.tlpobj new/tlpkg/tlpobj/colorinfo.tlpobj
--- old/tlpkg/tlpobj/colorinfo.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colorinfo.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -6,7 +6,7 @@
runfiles size=2
RELOC/tex/latex/colorinfo/colorinfo.sty
catalogue-ctan /macros/latex/contrib/colorinfo
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-18 16:48:54 +0200
catalogue-license lppl
catalogue-topics colour
catalogue-version 0.3c
++++++ coloring.doc.tar.xz ++++++
++++++ coloring.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coloring.tlpobj new/tlpkg/tlpobj/coloring.tlpobj
--- old/tlpkg/tlpobj/coloring.tlpobj 2016-05-12 03:16:59.000000000 +0200
+++ new/tlpkg/tlpobj/coloring.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=1
RELOC/tex/latex/coloring/coloring.sty
catalogue-ctan /macros/latex/contrib/coloring
-catalogue-date 2016-05-11 07:50:10 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics colour
catalogue-version 0.2
++++++ colorsep.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorsep.tlpobj new/tlpkg/tlpobj/colorsep.tlpobj
--- old/tlpkg/tlpobj/colorsep.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colorsep.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -7,6 +7,6 @@
runfiles size=2
RELOC/dvips/colorsep/colorsep.pro
catalogue-ctan /graphics/colorsep
-catalogue-date 2015-12-27 20:31:23 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics colour
++++++ colorspace.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/colorspace/README new/doc/latex/colorspace/README
--- old/doc/latex/colorspace/README 2015-06-16 23:22:12.000000000 +0200
+++ new/doc/latex/colorspace/README 2016-11-25 19:28:26.000000000 +0100
@@ -1,23 +1,29 @@
colorspace
-----------
-PDF color spaces. Currently, it supports:
+This package provides some tools related to PDF color spaces and color
+management. It requires xcolor, which is loaded if it has not been
+before.
-* spot colors
-* mixing inks (spot and process), up to 4
+Currently it supports what I think are the most common tools:
+
+* Spot colors (CMYK and CIE LAB)
+* Mixed spot and process colors (up to 4)
* ICC based default CMYK, RGB and Gray spaces
-* overprinting
+* Overprinting
-It requires xcolor and currently only pdftex and luatex.
+Currently only pdftex and luatex are supported. It seems to work with tikz.
-For example, to define a spot color, just say:
+For example, to define a spot color, just say something like:
\definespotcolor{foo}{BarTone 555 GN}{.3, .4, .5, .6}
-That's all.
+That's all.
+
+What's new
+----------
-Those docs, like the package itself, are still somewhat tentative, but
-the basic behaviour described here will be preserved in future
-versions.
+* 1.2.0 CIE LAB spot colors (including mixed inks with a CMYK alternative)
+* 1.1.1 is compatible with luatex 0.95
-2015-06-01
\ No newline at end of file
+2016-10-05
\ No newline at end of file
Binary files old/doc/latex/colorspace/colorspace.pdf and new/doc/latex/colorspace/colorspace.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/colorspace/colorspace.tex new/doc/latex/colorspace/colorspace.tex
--- old/doc/latex/colorspace/colorspace.tex 2015-06-16 23:22:12.000000000 +0200
+++ new/doc/latex/colorspace/colorspace.tex 2016-11-25 19:28:26.000000000 +0100
@@ -2,9 +2,9 @@
% | Typeset this file to get the documentation. |
% +--------------------------------------------------+
%
-%% Copyright (C) 2015 Javier Bezos
+%% Copyright (C) 2015-2016 Javier Bezos
%% All Rights Reserved
-%% http://www.tex-tipografia.com
+%% http://www.texnia.com
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3 of this
@@ -19,175 +19,507 @@
%% This Current Maintainer of this work is Javier Bezos.
%%
%% This work consists of the files colorspace.tex and colorspace.sty.
-\documentclass{article}
+\documentclass[a4paper]{ltxguide}
-\title{\textsf{colorspace}\\\large Version 1.1.0}
+\title{\textsf{colorspace}\\\large Version 1.2.0}
- \author{Javier Bezos\\\texttt{http://www.tex-tipografia.com}}
+\author{Javier Bezos\\\texttt{http://www.texnia.com}}
+
+\date{2016-10-05}
\raggedright
-\parskip=1ex
-
-\date{2015-06-01}
+\parskip=.8ex
+\advance\oddsidemargin-.7cm
+\advance\textwidth2cm
+\addtolength{\textheight}{3.5cm}
+\addtolength{\topmargin}{-2cm}
+
+\newif\ifcolorspace
+\newif\iftikz
+
+\usepackage{graphicx,bera}
+
+\IfFileExists{colorspace.sty}{%
+ \usepackage[illuminant=d65]{colorspace}%
+ \definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3}%
+ \definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4}%
+ \definespotcolor{foolab}{BarTone 888 LB}[alt=lab]%
+ {50, -30, -40/1, .20, .15, .07}%
+%
+ \definecolorspace{fooshaded}{mixed}{foo,black}%
+ \definecolorspace{labshaded}{mixed}{foolab,foob}%
+%
+ \definecolor{sfoo}{fooshaded}{1,0}
+ \definecolor{sblack}{fooshaded}{0,1}
+ \definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack}
+ \colorspacetrue}{}
+
+\IfFileExists{tikz.sty}{%
+ \catcode`|=12
+ \usepackage{tikz}%
+ \catcode`|=\active
+ \tikztrue}{}
+
+\def\showclr#1#{\testclr{#1}}
+\def\testclr#1#2{{\fboxsep0pt\fbox{\colorbox#1{#2}{\phantom{,MM}}}}}
+
+\makeatletter
+\def\@begintheorem#1#2{%
+ \list{}{}%
+ \global\advance\@listdepth\m@ne
+ \item[{\sffamily\bfseries\color{foob}\MakeUppercase{#1}}]}%
+\makeatother
+\newtheorem{warning}{Warning}
+\newtheorem{note}{Note}
+\newtheorem{example}{Example}
\begin{document}
-\maketitle
+{\fontsize{48}{48}\selectfont colorspace\par}
+{\LARGE Spot colors, mixed inks and more\par}
+\vspace*{1ex}
+Version 1.2.0 (2016-10-05)\par
+Javier Bezos (\texttt{http://www.texnia.com})
+
+\vspace*{6ex}
+
+The aim of this package is, as its name implies, to provide tools for
+PDF color spaces. It requires \textsf{xcolor}, which is loaded if it
+has not been before. It seems to work with \textsf{tikz}.
+
+Currently it supports what I think are the most common tools:
+\begin{itemize}
+\item Spot colors, with a clean user interface, and including tints
+ (with the |!| notation).
+\item CIE LAB spot colors.
+\item Proper switching of color spaces.
+\item Mixed spot and process colors (up to 4), like shades (ie, a spot
+ color with black). Also CIE LAB if a CMYK equivalent is provided.
+\item ICC based (or ``tagged'') default CMYK, RGB and Gray spaces.
+\item Overprinting (across pages, using the color stack).
+\end{itemize}
+Currently only \textsf{pdftex} and \textsf{luatex} are
+supported. Support for \textsf{xetex} is on the `to do' list, but due
+to the limitations of this engine this task is somewhat challenging
+and I'm not sure all features will be implemented.
+
+Other functions related to the PDF color spaces (indexed, calibrated,
+Lab spaces) are not yet suported, but they are under study. Calibrated
+colors, although not directly supported, can be defined with an ICC
+profile created with
+LPROF\footnote{\texttt{http://lprof.sourceforge.net/}} and then
+assigned to a default space as described below.
+
+They apply to text and line art only, not external images. For the
+latter, \textsf{graphicx} provides a plea of (undocumented)
+transformations: \texttt{interpolate}, \texttt{decodearray},
+\texttt{maskarray}, \texttt{intent}, \texttt{ocobjnum}, and
+\texttt{ocobjref}. For transparency, see \textsf{transparent}, by
+Heiko Oberdiek.
+
+This package is still evolving, but the basic behaviour described here
+will be preserved in future versions. However, some functions from
+\textsf{xcolor} might not work yet (for example \verb|\selectcolormodel|).
+
+Declarations are global and should go in the preamble.
This package is built on the previous attempts to provide spot colors
and other additional features by Jens Elstner, Stephan Lehmke and Siep
-Kroonenberg (with some inspiration from \textsf{ConTeXt}, too). It
-requires \textsf{xcolor}, which is loaded if it has not been before.
+Kroonenberg (with some inspiration from \textsf{ConTeXt}, too).
-It provides a clean user interface, with a single command for defining
-a spot color. It seems to work with \textsf{tikz}. Currently only
-\textsf{pdftex} and \textsf{luatex} are supported.
+\section{CMYK spot colors}
-Mixing spot colors (with process colors or other spots colors) is
-supported to some extent (see below). You can also assign ICC profiles
-to the default CMYK, RGB and Gray spaces. Other functions related to
-the PDF color spaces (indexed, calibrated, Lab spaces) are not yet
-suported, but they are\texttt{} under study. They apply to text and
-line art only, not external images. Declarations are global. Using
-\verb|\selectcolormodel| does not work yet.
+Spot colors are defined with a single macro:
-Those docs, like the package itself, are still somewhat tentative (as
-you very likely have noticed), but the basic behaviour described here
-will be preserved in future versions.
+\begin{decl}
+|\definespotcolor{<latex-name>}{<PDF-name>}{<CMYK-equivalent>}|
+\end{decl}
-For transparencies, see \textsf{transparent}, by Heiko Oberdiek.
+Here |<latex-name>| is the \LaTeX{} name, as used in \verb|\color| and
+the like, |<PDF-name>| is the PDF name (usually taken from a swatch
+book; multiple spaces are collapsed into one) as shown by PDF viewers,
+and the four numbers are the CMYK equivalent. \LaTeX{} knows nothing
+about the PDF name, which is just a string to be written to the
+generated file, while the PDF knows nothing about the \LaTeX{} name.
-\section{Spot colors}
+To mix inks, see below.
-Write, for example:
+\begin{example}
+ Write, for example:
\begin{verbatim}
-\definespotcolor{foo}{BarTone 555 GN}{.3,.4,.5,.6}
+\definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3}
\end{verbatim}
-
-That's all. Here \verb|foo| is the \LaTeX{} name, as used in
-\verb|\color| and the like, \verb|BarTone 555 GN| is the PDF name
-(multiple spaces are collapsed into one) as shown by PDF readers, and
-the four numbers are the CMYK equivalent. \LaTeX{} knows nothing about
-the PDF name, which is just a string to be written to the generated
-file, while the PDF knows nothing about the \LaTeX{} name.
+ This creates the color \showclr{foo}, which is used in \LaTeX{} as
+ |\color{foo}|. If you preflight the PDF file you will see a color
+ named `BarTone 555 GN' besides cyan, magenta, yellow and black.
You can use tints as usual in \textsf{xcolor}, like:
\begin{verbatim}
-\color{foo!60}
-\colorlet{foo60}{foo!60}
+\color{foo!50}
+\colorlet{foo50}{foo!50}
\end{verbatim}
-and even set tints from other tints. To mix inks, see below.
-
-The special PDF names \verb|All| (for all plates) and \verb|None| work
-as expected:
+\ifcolorspace
+ which would produce \showclr{foo!50}, and
+\fi
+even set tints from other tints.
+\end{example}
+
+\begin{note}
+ The special PDF names \verb|All| (for all plates) and \verb|None|
+ work as expected:
\begin{verbatim}
\definespotcolor{registration}{All}{1,1,1,1}
\end{verbatim}
+\end{note}
-Internally, only CMYK is used, but you can define the equivalent color
-with another name space, which is then converted:
+\begin{note}
+ Remember as far PDF is concerned a spot color is a color space on
+ its own.
+\end{note}
+
+\begin{note}
+ This package does not provide a list of Pantone, TrueMatch, HKS,
+ Folcoltone, Toyo, etc., colors. Currently you can find quite easily
+ CMYK equivalents on the web, and after all they are intended to be
+ used with a ``physical'' swatch book (and not, as often done, by
+ picking a color from a ``virtual'' palette just because it looks
+ nice on screen).
+\end{note}
+
+\begin{decl}
+|\definespotcolor{<latex-name>}{<PDF-name>}[<model>]{<equivalent>}|
+\end{decl}
+
+Internally, only CMYK is used for the equivalent color, but with this
+variant you can define the latter with another name space, which is
+then converted.
+\begin{example} The following definition is based on RGB:
+\begin{verbatim}
+\definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4}
+\end{verbatim}
+ which yields \showclr{foob}. Here \textsf{xcolor} just
+ converts this value to CMYK, which is still the space used
+ internally.
+\end{example}
+
+\begin{warning}
+ This conversion relies on the \textsf{xcolor} numerical methods,
+ which do not take into account any color profile and therefore
+ should be avoided in production if the alternate space is going to
+ be actually used. It is provided just for convenience in drafting or
+ in contexts where accuracy is not essential.
+\end{warning}
+
+\section{CIE LAB spot colors}
+
+Instead of targeting the CMYK space, spot colors may be defined using
+the CIE LAB (also known as L*a*b*, or even just Lab) space. Unlike the
+default CMYK space, which is by default device dependend, the Lab
+space is device independent. To define a Lab spot color, you must
+first set the illuminant with the package option |illuminant|, which
+takes a value:
+\begin{verbatim}
+\usepackage[illuminant=d65]{colorspace}
+\end{verbatim}
+Values are \texttt{a}, \texttt{c}, \texttt{e}, \texttt{d50},
+\texttt{d55}, \texttt{d65}, \texttt{d75}.
+
+The command to define a color is:
+\begin{decl}
+|\definespotcolor{<latex-name>}{<PDF-name>}[alt=lab]{<Lab-values>}|
+\end{decl}
+Note the optional argument with the string |alt=lab| (which cannot be
+combined with a model). The three |<Lab-values>| have ranges
+\textit{L}* $=$ $0$\ldots$100$, \textit{a}* $=$ $-$128$\ldots$127,
+\textit{b}* $=$ $-$128{\ldots}127, respectively.
+
+\begin{example}
+ With
+\begin{verbatim}
+\definespotcolor{foolab}{BarTone 888 LB}[alt=lab]{50, -30, -40}
+\end{verbatim}
+the result is \showclr{foolab}. An example of tint is
+\verb|\color{foolab!30}| (\showclr{foolab!30}).
+\end{example}
+
+\begin{warning}
+ The package does not warn if the color falls outside the gamut of
+ the CMYK space or if the color is not visible. To put it in
+ other words, you should not just write some arbitrary values to see
+ what happens.
+\end{warning}
+
+\begin{warning}
+ This model is not available in \textsf{xcolor}. If you need some
+ transformation, you must resort to an external tool like
+ \textsf{transicc} (or \textsf{icctrans}) included in Little
+ CMS\footnote{\texttt{http://www.littlecms.com/1/downloads.htm}}.
+\end{warning}
+
+\begin{warning}
+ There is no default illuminant -- it must be set if Lab colors are
+ defined.
+\end{warning}
+
+\begin{note}
+ The observer is currently only 2$^\circ$ (1931).
+\end{note}
+
+The Lab space allows to define colors accurately, but there is a price
+to pay -- mixing Lab colors is not in general possible except after
+converting them somehow to CMYK or RGB.\footnote{There are no simple
+rules to carry out those transformations, which, I think, explains why
+\textsf{xcolor} does not support Lab at all}. Since currently mixing
+colors in this package is based on CMYK, you must provide an alternate
+value as shown, if mixed inks are required\footnote{Internally, and
+in PDF jargon, Lab is the ``alternate space'' and ``tints transforms''
+are based on CMYK}:
\begin{verbatim}
-\definespotcolor{foo}{BarTone 555 GN}[rgb]{.5, .4, .3}
+\definespotcolor{foolab}{BarTone 888 LB}[alt=lab]{50, -30, -40/1, .20, .15, .07}
\end{verbatim}
-To change the color space for a page and the subsequent ones, you can
-set something like:
-\begin{verbatim}
-\pagecolorspace{name1,name2,name3}
-\end{verbatim}
-(It can be empty.) To return to the default color space, which
-contains all the defined spot colors, use \verb|\resetpagecolorspace|.
-Use this macro with care, because of the asynchronous nature of \TeX{}
--- remember it affects the whole current page.
-
\section{Mixing spot colors}
To mix spot colors you must first declare a color space (or model)
-including them. This is done with something like:
+including them. This is done with the following macro:
+
+\begin{decl}
+ |\definecolorspace{<latex-name>}{mixed}{<color-list>}|
+\end{decl}
+
+Here, |<latex-name>| is the name to be used in |\color| and the
+like as the color model. The second argument is the string |mixed|,
+and the last one is a list of up to 4 colors, either defined with
+\textsf{xcolor} using the CMYK model or spot.
+
+\begin{example}
+ A simple and typical usage would be for shades:
\begin{verbatim}
-\definecolorspace{name}{mixed}{color1,color2,color3}
+\definecolorspace{fooshaded}{mixed}{foo,black}
\end{verbatim}
-(The second argument is the type of color space.) For example, if we
-have two spot colors named \verb|spot1| and \verb|spot2|, and we want
-in addition yellow:
+ Then, you can define a color in this new model named
+ \verb|fooshaded| with:
\begin{verbatim}
-\definecolorspace{spot12y}{mixed}{spot1,spot2,yellow}
+\definecolor{darkfoo}{fooshaded}{.6,.3}
\end{verbatim}
-A typical usage, for shades, would be:
+Or set it with:
\begin{verbatim}
-\definecolorspace{shaded1}{mixed}{spot1,black}
+\color[fooshaded]{.6,.3}
\end{verbatim}
+In both cases, the mix is 60\% \verb|foo| and 30\% \verb|black|.
+\end{example}
-Due to internal limitations of \textsf{xcolor}, no more than four
-colors are allowed. The alternate color space in the PDF file is that
-of the spot colors (which means currently it is CMYK).
+\begin{example}
+ If we have two spot colors named \verb|spot1| and \verb|spot2|, and
+ we want in addition yellow:
+\begin{verbatim}
+\definecolorspace{mix12y}{mixed}{spot1,spot2,yellow}
+\end{verbatim}
+To define a new color based on this space:
+\begin{verbatim}
+\definecolor{mix12y}{mix12y}{.5,.4,.6}
+\end{verbatim}
+And to set it:
+\begin{verbatim}
+\color[mix12y]{.5,.4,.6}
+\end{verbatim}
+\end{example}
-Then, you can define a color with:
+\begin{example}
+Here is a duotone mixing the \verb|foob| and \verb|foolab| colors defined above:
\begin{verbatim}
-\definecolor{mix12y}{spot12y}{.5,.4,.6}
-\definecolor{sh1}{shaded1}{.6,.3}
+\definecolorspace{labshaded}{mixed}{foolab,foob}
\end{verbatim}
-or set it with
+The colors corresponding to:
\begin{verbatim}
-\color[spot12y]{.5,.4,.3}
-\color[shaded1]{.6,.3}
+\color[labshaded]{1,0} \color[labshaded]{.8,.2}
+\color[labshaded]{.6,.4} \color[labshaded]{.4,.6}
+\color[labshaded]{.2,.8} \color[labshaded]{0,1}
\end{verbatim}
-As in spot colors, the only operation allowed is \verb|!| for tints
-(ie, \verb|color!num|). But there is an easy trick to mix colors with
-\verb|!| and \verb|color,num| -- just define an ortogonal set of
-colors based on the new color model:
+are \showclr[labshaded]{1,0} \showclr[labshaded]{.8,.2}
+ \showclr[labshaded]{.6,.4} \showclr[labshaded]{.4,.6}
+ \showclr[labshaded]{.2,.8} \showclr[labshaded]{0,1}
+\end{example}
+
+\begin{warning}
+ Due to internal limitations of \textsf{xcolor}, no more than four
+ colors are allowed.
+\end{warning}
+
+\begin{note}
+ The alternate color space in the PDF file is that of the spot colors
+ (which means currently it is CMYK).
+\end{note}
+
+\begin{note}
+ There is an easy trick to mix colors with \verb|!| and
+ \verb|color,num| -- just define an ortogonal set of colors based on
+ the new color model:
\begin{verbatim}
-\definecolor{xspot1}{spot12y}{1,0,0}
-\definecolor{xspot2}{spot12y}{0,1,0}
-\definecolor{xyellow}{spot12y}{0,0,1}
+\definecolor{xspot1}{mix12y}{1,0,0}
+\definecolor{xspot2}{mix12y}{0,1,0}
+\definecolor{xyellow}{mix12y}{0,0,1}
\end{verbatim}
-and then you can say:
+ and then you can say:
\begin{verbatim}
\color{xspot1!30!xspot2!40!xyellow}
-\color{spot12y:xspot1,3;xspot2,2;xyellow,1}
+\color{mix12y:xspot1,3;xspot2,2;xyellow,1}
\end{verbatim}
-Of course, it is just a trick and a better and direct interface is
-under study.
+ Of course, it is just a trick and a better and direct interface is
+ under study (none of those provided by \textsf{xcolor} fits well
+ with the new |mixed| models).
+\end{note}
+
+\begin{warning}
+ Mixing colors in \verb|\color|, \verb|\definecolor| and the like
+ from diferent spaces can lead to unexpected results (currently no
+ checking is done).
+\end{warning}
+
+Color series (see the \textsf{xcolor} documentation) are also
+partially supported. For example:
+\begin{verbatim}
+\definecolorseries{test}{mix12y}{grad}[mix12y]{.95,.85,.55}{3,11,17}
+\definecolorseries{test}{mix12y}{last}{xyellow!50}{xspotA}
+\end{verbatim}
+
+\ifcolorspace
+\begin{example}
+ Here is a example with some of the described techniques, based on
+ the |fooshaded| space defined above (figure 1 shows the |foo|
+ plate):
+
+\begin{verbatim}
+\definecolor{sfoo}{fooshaded}{1,0}
+\definecolor{sblack}{fooshaded}{0,1}
+\definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack}
+\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}}
+\resetcolorseries[8]{shseries}
+\begin{tabular}{cccccccc}
+ 0 \testclr{shseries!!+} &
+ 1 \testclr{shseries!!+} &
+ 2 \testclr{shseries!!+} &
+ 3 \testclr{shseries!!+} &
+ 4 \testclr{shseries!!+} &
+ 5 \testclr{shseries!!+} &
+ 6 \testclr{shseries!!+} &
+ 7 \testclr{shseries!!+}
+\end{tabular}
+\end{verbatim}
+
+\begingroup
+\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}}
+\resetcolorseries[8]{shseries}
+\begin{tabular}{cccccccc}
+ 0 \testclr{shseries!!+} &
+ 1 \testclr{shseries!!+} &
+ 2 \testclr{shseries!!+} &
+ 3 \testclr{shseries!!+} &
+ 4 \testclr{shseries!!+} &
+ 5 \testclr{shseries!!+} &
+ 6 \testclr{shseries!!+} &
+ 7 \testclr{shseries!!+}
+\end{tabular}
+\endgroup
+\end{example}
+\fi
+
+\begin{figure}
+\fbox{\includegraphics[width=\linewidth]{colorspaceshade.png}}
+\caption{Plate for the \texttt{foo} spot color as shown by Adobe
+Acrobat. Note both \texttt{foob} and \texttt{foolab},
+defined in this document, are listed, too.}
+\end{figure}
+
+\section{Page color spaces}
+
+Each PDF page must know which colors will be used (other than the
+predefined CMYK, RGB and Gray). By default, \textsf{colorspace} turns
+on for every page all newly defined colors, and that will be fine in
+most cases. However, you may want to set explicitly the list (for
+covers or plates). Use this feature with care, because (1) the
+asynchronous nature of \TeX{} (remember it affects the whole current
+page), and (2) each distinct color list creates a PDF resource.
+
+\begin{decl}
+|\pagecolorspace{<color-list>}|\\
+|\resetpagecolorspace|
+\end{decl}
-Color series are also partially supported. For example:
+To change the color space for a page and the subsequent ones, you can
+set something like:
\begin{verbatim}
-\definecolorseries{test}{spot12y}{grad}[spot12y]{.95,.85,.55}{3,11,17}
-\definecolorseries{test}{spot12y}{last}{xyellow!50}{xspotA}
+\pagecolorspace{name1,name2,name3}
\end{verbatim}
+(It can be empty.) To return to the default color space, which
+contains all the defined spot colors, use \verb|\resetpagecolorspace|.
-(The key is not to mix the new model with other color models.)
-
-\section{ICC Based spaces}
+\section{ICC based spaces}
+\begin{decl}
+ |\definecolorspace*{<latex-name>}{iccbased}{<icc-file>}|
+\end{decl}
The starred version \verb|\definecolorspace*| does not define a new
color model, but sets the behaviour of the three basic color spaces
-(\verb|cmyk|, \verb|rgb| and \verb|gray|). When belonging to the same
-space, the last one for that space takes precedence. It cannot be used
-to define new colors or set them. Currently, only a type is supported --
-\verb|iccbased|. For example,
+(CMYK, RGB and Gray). When belonging to the same space, the last
+definition for that space takes precedence and it is considered the
+default one. It cannot be used to define new colors or set
+them. Currently, only a type is supported -- \verb|iccbased|. For
+example,
\begin{verbatim}
\definecolorspace*{sRGB}{iccbased}{sRGB Profile.icc}
\end{verbatim}
-The space it applies to is read from the ICC profile. The name can be
-used in \verb|\pagecolorspace| (and must, if you want it to be
-active). Alternatively, there are 3 reserved names: \verb|*rgb|,
-\verb|*gray|, \verb|*cmyk|, which stand for the current default
-spaces. The former are not set by \verb|\resetpagecolorspace|, but the
-starred named are.
-
-Note those ICC spaces does not go to the output intent dictionary (see
-the \textsf{pdfx} package). The latter, as the PDF reference explains,
-supplements rather than replaces the ICC profiles in a default color
-space.
+The space it applies to is read from the ICC profile.
+
+The name can be used in \verb|\pagecolorspace|. Alternatively, there
+are 3 reserved names: \verb|*rgb|, \verb|*gray|, \verb|*cmyk|, which
+stand for the last-defined, default ICC based spaces. Named ICC based
+spaces are not set by \verb|\resetpagecolorspace|, but the starred
+named are. On the other hand, the starred names are not set
+automatically by |\pagecolorspace|, and you must set them explicitly
+if you want them to be active.
+
+\begin{note}
+ Those ICC spaces do not go to the output intent dictionary (see
+ the \textsf{pdfx} package). The latter, as the PDF reference
+ explains, supplements rather than replaces the ICC profiles in a
+ default color space.
+\end{note}
+
+\begin{example}
+ Given the following declarations:
+\begin{verbatim}
+\definecolorspace*{sRGB}{iccbased}{sRGB Profile.icc}
+\definecolorspace*{colormatch}{ColorMatchRGB.icc}
+\end{verbatim}
+ and remembering the RGB space is always active (like the CMYK and
+ Gray ones),
+\begin{verbatim}
+\pagecolorspace{}
+\end{verbatim}
+leaves the RGB space unprofiled;
+\begin{verbatim}
+\pagecolorspace{sRGB}
+\end{verbatim}
+sets the RGB space to sRGB; while the following are (in this
+particular example) equivalent:
+\begin{verbatim}
+\pagecolorspace{colormatch}
+\pagecolorspace{*rgb}
+\resetpagecolorspace
+\end{verbatim}
+
+
+\end{example}
\section{Overprinting}
-This is usually a pre-print task, but by setting it in the document you
-will get a better idea of how the colors are actually
-overlapped. However, remember the effect produced is device-dependent,
-and colorant overprint decisions should be made at output time
-(according to the PDF reference).
+This is usually a pre-print task, but by setting it in the document
+you will get a better idea of how the colors are actually overlapped
+in soft proofing. However, remember the effect produced is
+device-dependent, and colorant overprint decisions should be made at
+output time (according to the PDF reference).
Very often, it is set for the whole document with the package options
\verb|knockout| (no overprint), and \verb|overprint|. By default, the
@@ -204,6 +536,17 @@
Since the color stack is used, pdf\TeX{} $\ge$ 1.40 is required.
+\begin{warning}
+ Some PDF viewers ignore this setting.
+\end{warning}
+
+\section{Version}
+
+1.1.1. No new features. Just internal changes related to
+\textsc{luatex} and new manual.
+
+1.2.0. CIE LAB spot colors and |illuminant|. Manual rewritten.
+
\end{document}
Binary files old/doc/latex/colorspace/colorspaceshade.png and new/doc/latex/colorspace/colorspaceshade.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorspace.doc.tlpobj new/tlpkg/tlpobj/colorspace.doc.tlpobj
--- old/tlpkg/tlpobj/colorspace.doc.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colorspace.doc.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -1,9 +1,10 @@
name colorspace.doc
category Package
-revision 37573
+revision 42228
shortdesc doc files of colorspace
relocated 1
-docfiles size=29
+docfiles size=35
RELOC/doc/latex/colorspace/README
RELOC/doc/latex/colorspace/colorspace.pdf
RELOC/doc/latex/colorspace/colorspace.tex
+ RELOC/doc/latex/colorspace/colorspaceshade.png
++++++ colorspace.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/colorspace/colorspace.sty new/tex/latex/colorspace/colorspace.sty
--- old/tex/latex/colorspace/colorspace.sty 2015-06-16 23:22:12.000000000 +0200
+++ new/tex/latex/colorspace/colorspace.sty 2016-11-25 19:33:45.000000000 +0100
@@ -2,9 +2,9 @@
% | Typeset colorspace.tex to get the documentation. |
% +--------------------------------------------------+
%
-%% Copyright (C) 2015 Javier Bezos
+%% Copyright (C) 2015-2016 Javier Bezos
%% All Rights Reserved
-%% http://www.tex-tipografia.com
+%% http://www.texnia.com
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3 of this
@@ -21,7 +21,8 @@
%% This work consists of the files colorspace.tex and colorspace.sty.
\ProvidesPackage{colorspace}
- [2015/06/01 v1.1.0 PDF color spaces (spot colors...) for pdfTeX]
+ [2016/10/05 v1.2.0 PDF color spaces (spot colors...) for
+ pdftex and luatex]
\edef\spc@savedcatcodes{%
\catcode`\noexpand\/=\the\catcode`\/
@@ -33,6 +34,22 @@
\catcode`\<=12
\catcode`\&=11 % we use it in macro names
+% pdftex vs luatex compatibility
+
+\ifx\pdfextension\@undefined
+ \let\spc@Pageresources\pdfpageresources
+ \let\spc@Obj\pdfobj
+ \let\spc@Lastobj\pdflastobj
+ \let\spc@Colorstack\pdfcolorstack
+ \let\spc@Colorstackinit\pdfcolorstackinit
+\else
+ \edef\spc@Pageresources{\pdfvariable pageresources}
+ \protected\def\spc@Obj{\pdfextension obj }
+ \protected\def\spc@Lastobj{\numexpr\pdffeedback lastobj\relax}
+ \protected\def\spc@Colorstack{\pdfextension colorstack}
+ \def\spc@Colorstackinit{\pdffeedback colorstackinit}
+\fi
+
\def\spc@unknown#1#2{%
\@ifundefined{#1}%
{\PackageError{colorspace}{Unknown #2}%
@@ -111,6 +128,25 @@
\newcommand\definespotcolor[2]{\protected@edef\spc@tempa{{#1}{#2}}\spc@defsc}
\newcommand\spc@defsc[2][cmyk]{\expandafter\spc@defsc@i\spc@tempa{#1}{#2}}
+
+\def\spc@splitbar#1#2#3/#4\@nil{%
+ \def#1{#3}%
+ \def#2{#4}}
+
+\let\spc@lab@values\relax
+
+\@namedef{spc@opt@alt=lab}#1{%
+ \@expandtwoargs\in@{/}{#1}%
+ \ifin@
+ \spc@splitbar\spc@lab@values\spc@the@cmyk#1\@nil
+ \else
+ \def\spc@lab@values{#1}%
+ \def\spc@the@cmyk{0,0,0,0}% dummy
+ \fi
+ \def\spc@tempd##1,{% comma -> space
+ \ifx\@empty##1\else##1 \expandafter\spc@tempd\fi}%
+ \edef\spc@lab@values{\expandafter\spc@tempd\spc@lab@values,\@empty,}}
+
\def\spc@defsc@i#1#2#3#4{%
\def\spc@tempc##1 ##2{% Converts spaces to #20
##1%
@@ -126,13 +162,24 @@
{This spot name was taken by `##2'.}%
\fi}
\spc@csall
- \definecolor{#1}{cmyk:#3}{#4}% internally always cmyk
- \expandafter\spc@cmyktospot{#1}\spc@tempb % Convert from cmyk to spot
- \immediate\pdfobj{[ /Separation /\spc@tempb\space
- /DeviceCMYK << /FunctionType 2 /Domain [0 1]
- /C0 [0 0 0 0] /C1 [\spc@tempa] /N 1 >> ]}% pdf separation
+ \@ifundefined{spc@opt@\zap@space#3 \@empty}%
+ {\definecolor{#1}{cmyk:#3}{#4}}%
+ {\@nameuse{spc@opt@\zap@space#3 \@empty}{#4}%
+ \definecolor{#1}{cmyk}{\spc@the@cmyk}}%
+ \expandafter\spc@cmyktospot{#1}\spc@tempb % Convert cmyk > spot
+ \ifx\spc@lab@values\relax
+ \immediate\spc@Obj{[ /Separation /\spc@tempb\space
+ /DeviceCMYK << /FunctionType 2 /Domain [0 1]
+ /C0 [0 0 0 0] /C1 [\spc@tempa] /N 1 >> ]}% pdf separation
+ \else
+ \immediate\spc@Obj{[ /Separation /\spc@tempb\space
+ \spc@illum@ref << /FunctionType 2 /Domain [0 1]
+ /Range[0 100 -128 127 -128 127]
+ /C0 [100 0 0] /C1 [\spc@lab@values] /N 1 >> ]}% pdf separation
+ \global\let\spc@lab@values\relax
+ \fi
\expandafter\xdef\csname spc@ir@#1\endcsname{%
- /&\spc@tempb\space\the\pdflastobj\space 0 R}% save ref to obj
+ /&\spc@tempb\space\the\spc@Lastobj\space 0 R}% save ref to obj
\let\spc@elt\relax
\xdef\spc@csall{\spc@csall\spc@elt2{#1}}}
@@ -141,6 +188,23 @@
\resetpagecolorspace
\fi}
+% Options for illuminants:
+
+\def\spc@illum@obj#1{%
+ \immediate\spc@Obj{[ /Lab
+ << /WhitePoint [#1] /Range [-128 127 -128 127] >> ]}%
+ \xdef\spc@illum@ref{\the\spc@Lastobj\space 0 R }}
+
+% 1931, 2-degree observer. c is deprecated
+
+\DeclareOption{illuminant=a}{\spc@illum@obj{1.0985 1 0.3558}}
+\DeclareOption{illuminant=c}{\spc@illum@obj{0.9807 1 1.1822}}
+\DeclareOption{illuminant=e}{\spc@illum@obj{1 1 1}}
+\DeclareOption{illuminant=d50}{\spc@illum@obj{0.9642 1 0.8251}}
+\DeclareOption{illuminant=d55}{\spc@illum@obj{0.9568 1 0.9214}}
+\DeclareOption{illuminant=d65}{\spc@illum@obj{0.9504 1 1.0888}}
+\DeclareOption{illuminant=d75}{\spc@illum@obj{0.9497 1 1.2261}}
+
% Page color spaces. The arrays mapping the spot colors to the obj
% refs are saved into the pdf as objects, and then we also save its
% reference for later recovery. Well, \pdfpageresources is not
@@ -161,7 +225,7 @@
\def\spc@pagecs#1{%
\ifx\spc@currcs\@empty\else
\edef\tempa{%
- \noexpand\spc@remcs\the\pdfpageresources
+ \noexpand\spc@remcs\the\spc@Pageresources
\noexpand\spc@remcs{\spc@currcs}}%
\tempa
\fi
@@ -184,13 +248,13 @@
\fi}%
\spc@csall % Uses \spc@elt
\@ifundefined{spc@cs@\spc@tempc}%
- {\immediate\pdfobj{<< \spc@tempb>>}%
- \expandafter\xdef\csname spc@cs@\spc@tempc\endcsname{\the\pdflastobj}}%
+ {\immediate\spc@Obj{<< \spc@tempb>>}%
+ \expandafter\xdef\csname spc@cs@\spc@tempc\endcsname{\the\spc@Lastobj}}%
{}%
\expandafter\let\expandafter\spc@currcs\csname spc@cs@\spc@tempc\endcsname
\ifx\spc@currcs\@empty\else
- \edef\spc@tempa{\pdfpageresources{%
- \the\pdfpageresources\space/ColorSpace \@nameuse{spc@cs@\spc@tempc} 0 R}}%
+ \edef\spc@tempa{\spc@Pageresources{%
+ \the\spc@Pageresources\space/ColorSpace \@nameuse{spc@cs@\spc@tempc} 0 R}}%
\spc@tempa
\fi}
@@ -201,7 +265,7 @@
\def\spc@remcs#1\spc@remcs#2{%
\def\spc@tempc##1 /ColorSpace #2 ##2 R##3\spc@tempc{%
- \pdfpageresources{##1##3}}%
+ \spc@Pageresources{##1##3}}%
\spc@tempc#1\spc@tempc}
% Support for pgf (I hope--)
@@ -321,6 +385,8 @@
{\spc@dflttrue\spc@defcs}%
{\spc@dfltfalse\spc@defcs}}
+\@onlypreamble\definecolorspace
+
\def\spc@defcs#1#2#3{%
\@ifundefined{spc@defcs@#2}%
{\spc@unknown{spc@defcs@#2}{color space type `#2'}}%
@@ -389,7 +455,7 @@
\csname spc@ascmyk@\spc@tempa\endcsname\@@
\advance\@tempcntb-4\relax
\fi}%
- \immediate\pdfobj stream attr
+ \immediate\spc@Obj stream attr
{/FunctionType 4
/Domain [ \spc@pdfdoms]
/Range [ 0 1 0 1 0 1 0 1 ]}%
@@ -400,11 +466,11 @@
\spc@@Pblack\spc@@black neg 1.0 add\spc@nl
\the\numexpr4+\@tempcntb\relax\space 4 roll\spc@@pops
\space\string}}%
- \immediate\pdfobj{[ /DeviceN [\spc@pdfdevn\space] /DeviceCMYK
- \the\pdflastobj\space0 R
+ \immediate\spc@Obj{[ /DeviceN [\spc@pdfdevn\space] /DeviceCMYK
+ \the\spc@Lastobj\space0 R
<< /Colorants <<\spc@pdfclrnts\space >> >> ]}%
\expandafter\xdef\csname spc@ir@#1\endcsname{%
- /\spc@name\space\the\pdflastobj\space 0 R}% save ref to obj
+ /\spc@name\space\the\spc@Lastobj\space 0 R}% save ref to obj
\let\spc@elt\relax
\xdef\spc@csall{\spc@csall\spc@elt2{#1}}%
\xdef\spc@tempa{%
@@ -414,7 +480,7 @@
\endgroup
\spc@tempa}
-% === ICC based dafault spaces ===
+% === ICC based default spaces ===
% luatex removed pdffiledump, so we use lua code.
@@ -447,13 +513,13 @@
{\PackageError{colorspace}{Unsupported ICC space}%
{Currently, only Gray, RGB and CMYK are supported}}%
{\edef\spc@tempa{\@nameuse{spc@@\spc@tempa}}}%
- \immediate\pdfobj
+ \immediate\spc@Obj
stream attr {\ifcase\spc@tempa
/N 1 /Alternate /DeviceGray\or
/N 3 /Alternate /DeviceRGB\or
/N 4 /Alternate /DeviceCMYK\fi}%
file {#2}%
- \immediate\pdfobj{[ /ICCBased \the\pdflastobj\space 0 R ]}%
+ \immediate\spc@Obj{[ /ICCBased \the\spc@Lastobj\space 0 R ]}%
% to the default color list, add an intermediate name *<model>
% (only once) containing the last setting (add also the
% actual name with flag 1 instead of 2)
@@ -462,10 +528,10 @@
{\xdef\spc@csall{\spc@csall\spc@elt2{*\spc@@spacelc}}}%
{} % -- do nothing
\expandafter\xdef\csname spc@ir@*\spc@@spacelc\endcsname{%
- /Default\spc@@space\space\the\pdflastobj\space 0 R}%
+ /Default\spc@@space\space\the\spc@Lastobj\space 0 R}%
\xdef\spc@csall{\spc@csall\spc@elt1{#1}}%
\expandafter\xdef\csname spc@ir@#1\endcsname{%
- /Default\spc@@space\space\the\pdflastobj\space 0 R}%
+ /Default\spc@@space\space\the\spc@Lastobj\space 0 R}%
\endgroup}
@@ -495,21 +561,21 @@
\newcommand\textoverprint[2][\spc@opm]{{\overprintstate{#1}#2}}
-\immediate\pdfobj{<< /Type /ExtGState /op false /OP false >>}%
-\edef\spc@tempa{/SPCko \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}%
-\edef\spc@tempa{\spc@tempa/SPCmz \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}%
-\edef\spc@tempa{\spc@tempa/SPCop \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< \spc@tempa>>}%
-\edef\spc@tempa{\global\pdfpageresources{\the\pdfpageresources
- \space /ExtGState \the\pdflastobj\space 0 R }}
+\immediate\spc@Obj{<< /Type /ExtGState /op false /OP false >>}%
+\edef\spc@tempa{/SPCko \the\spc@Lastobj\space 0 R }%
+\immediate\spc@Obj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}%
+\edef\spc@tempa{\spc@tempa/SPCmz \the\spc@Lastobj\space 0 R }%
+\immediate\spc@Obj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}%
+\edef\spc@tempa{\spc@tempa/SPCop \the\spc@Lastobj\space 0 R }%
+\immediate\spc@Obj{<< \spc@tempa>>}%
+\edef\spc@tempa{\global\spc@Pageresources{\the\spc@Pageresources
+ \space /ExtGState \the\spc@Lastobj\space 0 R }}
\spc@tempa
\def\spc@setop{%
- \pdfcolorstack\spc@opstack push{\spc@getop}%
+ \spc@Colorstack\spc@opstack push{\spc@getop}%
\aftergroup\spc@resetop}
-\def\spc@resetop{\pdfcolorstack\spc@opstack pop\relax}
+\def\spc@resetop{\spc@Colorstack\spc@opstack pop\relax}
\def\spc@getop{%
\ifcase\spc@op
/SPCmz gs
@@ -519,7 +585,7 @@
/SPCko gs
\fi}
-\chardef\spc@opstack\pdfcolorstackinit page direct{\spc@getop}
+\chardef\spc@opstack\spc@Colorstackinit page direct{\spc@getop}
\spc@savedcatcodes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorspace.tlpobj new/tlpkg/tlpobj/colorspace.tlpobj
--- old/tlpkg/tlpobj/colorspace.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colorspace.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -1,6 +1,6 @@
name colorspace
category Package
-revision 37573
+revision 42228
shortdesc Provides PDF color spaces
relocated 1
longdesc The package provides PDF color spaces. Currently, only spot
@@ -9,7 +9,7 @@
runfiles size=5
RELOC/tex/latex/colorspace/colorspace.sty
catalogue-ctan /macros/latex/contrib/colorspace
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2016-11-16 07:47:52 +0100
catalogue-license lppl1.3
-catalogue-topics colour-supp
-catalogue-version 1.1.0
+catalogue-topics colour
+catalogue-version 1.2.0
++++++ colortab.doc.tar.xz ++++++
++++++ colortab.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortab.tlpobj new/tlpkg/tlpobj/colortab.tlpobj
--- old/tlpkg/tlpobj/colortab.tlpobj 2016-04-14 18:52:35.000000000 +0200
+++ new/tlpkg/tlpobj/colortab.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/generic/colortab/colortab.sty
RELOC/tex/generic/colortab/colortab.tex
catalogue-ctan /macros/generic/colortab
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics colour table
catalogue-version 1.0
++++++ colortbl.doc.tar.xz ++++++
++++++ colortbl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortbl.tlpobj new/tlpkg/tlpobj/colortbl.tlpobj
--- old/tlpkg/tlpobj/colortbl.tlpobj 2016-04-14 18:52:36.000000000 +0200
+++ new/tlpkg/tlpobj/colortbl.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -9,7 +9,7 @@
RELOC/tex/latex/colortbl/colortbl.sty
catalogue-also xcolor
catalogue-ctan /macros/latex/contrib/colortbl
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics colour table
catalogue-version 1.0a
++++++ colorwav.doc.tar.xz ++++++
++++++ colorwav.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorwav.tlpobj new/tlpkg/tlpobj/colorwav.tlpobj
--- old/tlpkg/tlpobj/colorwav.tlpobj 2016-04-14 18:52:36.000000000 +0200
+++ new/tlpkg/tlpobj/colorwav.tlpobj 2017-04-14 17:36:11.000000000 +0200
@@ -6,11 +6,11 @@
longdesc The package allows the user to obtain an RGB value (suitable
longdesc for use in the color package) from a wavelength of light. The
longdesc default unit is nanometres, but other units may be used. Note
-longdesc that this function is also available within the xcolor.
+longdesc that this function is also available within xcolor.
runfiles size=2
RELOC/tex/latex/colorwav/colorwav.sty
catalogue-ctan /macros/latex/contrib/colorwav
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-11-16 07:52:38 +0100
catalogue-license lgpl
-catalogue-topics colour-supp
+catalogue-topics colour
catalogue-version 1.0
++++++ colorweb.doc.tar.xz ++++++
++++++ colorweb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorweb.tlpobj new/tlpkg/tlpobj/colorweb.tlpobj
--- old/tlpkg/tlpobj/colorweb.tlpobj 2016-04-14 18:52:37.000000000 +0200
+++ new/tlpkg/tlpobj/colorweb.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=5
RELOC/tex/latex/colorweb/colorweb.sty
catalogue-ctan /macros/latex/contrib/colorweb
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics colour
catalogue-version 1.3
++++++ colourchange.doc.tar.xz ++++++
++++++ colourchange.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colourchange.tlpobj new/tlpkg/tlpobj/colourchange.tlpobj
--- old/tlpkg/tlpobj/colourchange.tlpobj 2016-04-14 18:52:38.000000000 +0200
+++ new/tlpkg/tlpobj/colourchange.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/colourchange/colourchange.sty
catalogue-ctan /macros/latex/contrib/colourchange
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl3
catalogue-topics presentation colour
catalogue-version 1.22
++++++ combelow.doc.tar.xz ++++++
++++++ combelow.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combelow.tlpobj new/tlpkg/tlpobj/combelow.tlpobj
--- old/tlpkg/tlpobj/combelow.tlpobj 2016-04-14 18:52:38.000000000 +0200
+++ new/tlpkg/tlpobj/combelow.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/latex/combelow/combelow.sty
catalogue-ctan /macros/latex/contrib/combelow
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics fake-glyph
catalogue-version 0.99f
++++++ combine.doc.tar.xz ++++++
++++++ combine.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combine.tlpobj new/tlpkg/tlpobj/combine.tlpobj
--- old/tlpkg/tlpobj/combine.tlpobj 2016-04-14 18:52:38.000000000 +0200
+++ new/tlpkg/tlpobj/combine.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -16,7 +16,7 @@
RELOC/tex/latex/combine/combnat.sty
catalogue-also docmute includex newclude standalone
catalogue-ctan /macros/latex/contrib/combine
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics subdocs
catalogue-version 0.7a
++++++ combinedgraphics.doc.tar.xz ++++++
++++++ combinedgraphics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combinedgraphics.tlpobj new/tlpkg/tlpobj/combinedgraphics.tlpobj
--- old/tlpkg/tlpobj/combinedgraphics.tlpobj 2016-04-14 18:52:39.000000000 +0200
+++ new/tlpkg/tlpobj/combinedgraphics.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -18,7 +18,7 @@
runfiles size=4
RELOC/tex/latex/combinedgraphics/combinedgraphics.sty
catalogue-ctan /macros/latex/contrib/combinedgraphics
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics graphics-supp
catalogue-version 0.2.2
++++++ comfortaa.doc.tar.xz ++++++
++++++ comfortaa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comfortaa.tlpobj new/tlpkg/tlpobj/comfortaa.tlpobj
--- old/tlpkg/tlpobj/comfortaa.tlpobj 2016-04-14 18:52:39.000000000 +0200
+++ new/tlpkg/tlpobj/comfortaa.tlpobj 2017-04-14 17:36:12.000000000 +0200
@@ -246,7 +246,7 @@
RELOC/tex/latex/comfortaa/ts1fco.fd
RELOC/tex/latex/comfortaa/x2fco.fd
catalogue-ctan /fonts/comfortaa
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics font font-sans font-supp
catalogue-version 2.3
++++++ comicneue.doc.tar.xz ++++++
Binary files old/doc/latex/comicneue/comicneue.pdf and new/doc/latex/comicneue/comicneue.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comicneue/comicneue.tex new/doc/latex/comicneue/comicneue.tex
--- old/doc/latex/comicneue/comicneue.tex 2015-07-04 00:04:02.000000000 +0200
+++ new/doc/latex/comicneue/comicneue.tex 2017-01-04 00:01:03.000000000 +0100
@@ -1,5 +1,5 @@
-\documentclass[10pt,a4paper,english]{article}
-\usepackage{geometry,metalogo,hyperref,babel,mdwlist,multicol,parskip}
+\documentclass[10pt,a4paper,english,twocolumn]{article}
+\usepackage{geometry,metalogo,hyperref,babel,mdwlist,parskip}
\usepackage[default]{comicneue}
\usepackage[scaled=.9]{sourcecodepro}
@@ -15,11 +15,10 @@
}
\author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}}
-\date{Documentation for comicneue v1.0.\\ \today}
-\listfiles
+\date{Documentation for comicneue v1.1.\\ \today}
+
\begin{document}
\maketitle
-\begin{multicols}{2}
This package provides the Comic Neue fonts in an easy to use way.
For \XeLaTeX\ and \LuaLaTeX\ users the original OpenType fonts are used.
The entire font family is included.
@@ -66,17 +65,22 @@
\section{Version history}
+\subsection*{1.1}
+\begin{itemize*}
+ \item Joseph Wright: \cmd{sys\_if\_engine} replaces \cmd{pdftex\_if\_engine} (\href{https://github.com/silkeh/latex-raleway/pull/1}{pull request~\#1}).
+\end{itemize*}
+
\subsection*{1.0}
\begin{itemize*}
\item Initial release with v2.2 of the fonts.
\end{itemize*}
-\end{multicols}
-
+\onecolumn
\clearpage
\section{Specimen}
\label{sec:specimen}
+
\subsection{OpenType}
\begin{figure}[ht]
\centering
@@ -92,4 +96,3 @@
This table can also be found in \file{comicneue-type1-specimen}.
\end{document}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comicneue.doc.tlpobj new/tlpkg/tlpobj/comicneue.doc.tlpobj
--- old/tlpkg/tlpobj/comicneue.doc.tlpobj 2016-04-14 18:52:41.000000000 +0200
+++ new/tlpkg/tlpobj/comicneue.doc.tlpobj 2017-04-14 17:36:13.000000000 +0200
@@ -1,6 +1,6 @@
name comicneue.doc
category Package
-revision 37744
+revision 42851
shortdesc doc files of comicneue
relocated 1
docfiles size=40
++++++ comicneue.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/comicneue/comicneue.sty new/tex/latex/comicneue/comicneue.sty
--- old/tex/latex/comicneue/comicneue.sty 2015-07-04 00:04:02.000000000 +0200
+++ new/tex/latex/comicneue/comicneue.sty 2017-01-04 00:01:12.000000000 +0100
@@ -10,11 +10,11 @@
\RequirePackage{ l3keys2e, xparse }
\ProvidesExplClass
{comicneue}
- {2015/07/03}
- {1.0}
+ {2017/01/03}
+ {1.1}
{Craig Rozynski's Comic Neue fonts}
-\pdftex_if_engine:F{ \bool_set_true:N \comicneue_otf }
+\sys_if_engine_pdftex:F{ \bool_set_true:N \comicneue_otf }
\tl_set:Nn \comicneue_scale {1}
@@ -38,7 +38,7 @@
\bool_if:NTF \comicneue_otf {
\RequirePackage{ fontspec }
-
+
\bool_if:NTF \comicneue_light
{ \tl_set:Nn \comicneue_regstyle {Light} }
{ \tl_set:Nn \comicneue_regstyle {Regular} }
@@ -53,14 +53,14 @@
Extension = .otf,
BoldFont = *_Bold,
BoldItalicFont = *_Bold_Oblique }
-
+
\bool_if:NT \comicneue_sfdefault {
\setsansfont
[ UprightFont = *_\comicneue_regstyle,
ItalicFont = *_\comicneue_regstyle _Oblique ]
{ComicNeue\comicneue_style}
}
-
+
\newfontfamily \comicneue
[ UprightFont = *_Regular,
ItalicFont = *_Regular_Oblique ]
@@ -70,7 +70,7 @@
[ UprightFont = *_Light,
ItalicFont = *_Light_Oblique ]
{ComicNeue}
-
+
\newfontfamily \comicneueangular
[ UprightFont = *_Regular,
ItalicFont = *_Regular_Oblique ]
@@ -96,20 +96,20 @@
\bool_if:NT \comicneue_sfdefault
{ \tl_set:Nn \sfdefault {ComicNeue\comicneue_style-TLF} }
-
+
\bool_if:NT \comicneue_default
{ \tl_set:Nx \seriesdefault{\mdseries@sf} }
\NewDocumentCommand \comicneue {}
{ \fontfamily{ComicNeue-TLF}\selectfont }
-
+
\NewDocumentCommand \comicneuelight {}
{ \fontfamily{ComicNeue-TLF}\fontseries{l}\selectfont }
-
+
\NewDocumentCommand \comicneueangular {}
{ \fontfamily{ComicNeueAngular-TLF}\selectfont }
-
- \NewDocumentCommand \comicneueangularlight {}
+
+ \NewDocumentCommand \comicneueangularlight {}
{ \fontfamily{ComicNeueAngular-TLF}\fontseries{l}\selectfont }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comicneue.tlpobj new/tlpkg/tlpobj/comicneue.tlpobj
--- old/tlpkg/tlpobj/comicneue.tlpobj 2016-04-14 18:52:41.000000000 +0200
+++ new/tlpkg/tlpobj/comicneue.tlpobj 2017-04-14 17:36:13.000000000 +0200
@@ -1,6 +1,6 @@
name comicneue
category Package
-revision 37744
+revision 42851
shortdesc Use Comic Neue with TeX(-alike) systems
relocated 1
longdesc Comic Neue is a well-known redesign of the (in)famous Comic
@@ -243,7 +243,7 @@
RELOC/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd
RELOC/tex/latex/comicneue/comicneue.sty
catalogue-ctan /fonts/comicneue
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-01-03 14:41:44 +0100
catalogue-license ofl
catalogue-topics font font-otf font-supp font-type1
-catalogue-version 1.0
+catalogue-version 1.1
++++++ comma.doc.tar.xz ++++++
++++++ comma.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comma.tlpobj new/tlpkg/tlpobj/comma.tlpobj
--- old/tlpkg/tlpobj/comma.tlpobj 2016-04-14 18:52:42.000000000 +0200
+++ new/tlpkg/tlpobj/comma.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/comma/comma.sty
catalogue-ctan /macros/latex/contrib/comma
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics numbers
catalogue-version 1.2
++++++ commado.doc.tar.xz ++++++
++++++ commado.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/commado.tlpobj new/tlpkg/tlpobj/commado.tlpobj
--- old/tlpkg/tlpobj/commado.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/commado.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -20,7 +20,7 @@
RELOC/tex/generic/commado/filesdo.sty
catalogue-also loops
catalogue-ctan /macros/generic/commado
-catalogue-date 2015-11-16 11:38:48 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version r0.11a
++++++ commath.doc.tar.xz ++++++
++++++ commath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/commath.tlpobj new/tlpkg/tlpobj/commath.tlpobj
--- old/tlpkg/tlpobj/commath.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/commath.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/commath/commath.sty
catalogue-ctan /macros/latex/contrib/commath
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths
catalogue-version 0.3
++++++ comment.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/Makefile new/doc/latex/comment/Makefile
--- old/doc/latex/comment/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/Makefile 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,6 @@
+info :
+ @echo "there is nothing to make here"
+clean :
+ @/bin/rm -f *~ *.{aux,log,out} *.cut
+zip : clean
+ @cd .. ; zip comment.zip comment/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/README new/doc/latex/comment/README
--- old/doc/latex/comment/README 2010-02-23 01:21:51.000000000 +0100
+++ new/doc/latex/comment/README 2016-11-25 19:28:27.000000000 +0100
@@ -1,3 +1,7 @@
-files:
-comment.sty -- the latest version (August 1998)
-comm_latest.tex -- a LaTeX test file for comment.sty
+Files:
+- comment.sty : LaTeX comment style
+- comment_plain.tex : plain TeX version, no longer maintained
+- comment.{tex,pdf} : description of how the style works
+
+- comm_test.tex : illustrative test
+- t1test.tex : test of T1 non-ascii characters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_bug.tex new/doc/latex/comment/comm_bug.tex
--- old/doc/latex/comment/comm_bug.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/comm_bug.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,32 @@
+\documentclass[12pt]{article}
+
+\usepackage{comment}
+\excludecomment{conditional}
+
+\specialcomment{redcomment}{\begingroup\em\Large}{\endgroup\tiny}
+
+\begin{document}
+
+plain text.
+
+\newcommand{\Redcomment}[1]{Original Definition. (#1).}
+
+\begin{conditional}
+Conditional Text.
+
+More Conditional Text in next paragraph.
+
+\renewcommand{\Redcomment}[1]{Redefinition Worked! (#1).}
+\end{conditional}
+
+\begin{redcomment}
+the first redcomment paragraph.
+
+the second redcomment paragraph.
+\end{redcomment}
+
+Because redcomment has ended, this should be tiny.
+
+\Redcomment{This is the command line version.}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_latest.tex new/doc/latex/comment/comm_latest.tex
--- old/doc/latex/comment/comm_latest.tex 2010-02-23 01:21:51.000000000 +0100
+++ new/doc/latex/comment/comm_latest.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-% An illustration of comment.sty by Victor Eijkhout,
-% version 3.4 and later.
-%
-% For use with LaTeX2.09, and LaTeX2e in compatibility mode.
-%
-\documentstyle{article}
-\begin{document}
-
-\input comment.sty
-
-\includecomment{thisone}
-\excludecomment{notthisone}
-
-This sentence
-\begin{comment}
-has
-\end{comment}
-no verb.
-
-Check for\begin{notthisone}
-superfluous
-\end{notthisone}
-spaces (there should be none between `for' and `spaces'),
-and around
-\begin{thisone}
-inclusion
-\end{thisone}
-of proper texts (one space between `around' and `inclusion',
-and one between `inclusion' and `of').
-
-Als check for
-\begin{thisone}
-multiple paragraphs.
-
-Such as
-\end{thisone}
-here. (`Such as' should be a new paragraph.)
-
-% a test of the special comments
-\specialcomment{smallfry}{\begingroup\rmfamily\footnotesize}{\endgroup}
-%\tracingmacros=2 \tracingcommands=2
-This text is
-\begin{smallfry}
-rather small
-\end{smallfry}
-don't you think? (The `rather small' should be footnotesize.)
-
-And now we disable
-\excludecomment{smallfry}
-\begin{smallfry}
-the special comment
-\end{smallfry}
-environment
-(in between `disable' and `environment' is some excluded material).
-
-% test of weird grouping
-We switch to
-\begin{thisone}
-\bf bold face
-\end{thisone}
-inside \rm a comment. (The phrase `bold face inside' should be bold.)
-
-\newcount\comlines
-\processcomment{countedcomment}
- {\comlines=0\relax
- \def\ThisComment##1{\global\advance\comlines1\relax}}
- {}{**Comment: \number\comlines\ line(s) removed**}
-
-This is a line of text
-\begin{countedcomment}
-Oneline
-\end{countedcomment}
-another line of text
-\begin{countedcomment}
-One line
-Two line
-Three line
-\end{countedcomment}
-last line of text.
-
-\end{document}
Binary files old/doc/latex/comment/comm_test.pdf and new/doc/latex/comment/comm_test.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test.tex new/doc/latex/comment/comm_test.tex
--- old/doc/latex/comment/comm_test.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/comm_test.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,97 @@
+% An illustration of comment.sty by Victor Eijkhout,
+% version 3.4 and later.
+%
+\documentclass{article}
+
+\usepackage{comment}
+
+\begin{document}
+
+\includecomment{thisone}
+\excludecomment{notthisone}
+
+This sentence
+\begin{comment}
+has
+\end{comment}
+no verb.
+
+Check for\begin{notthisone}
+superfluous
+\end{notthisone}
+spaces (there should be none between `for' and `spaces'),
+and around
+\begin{thisone}
+inclusion
+\end{thisone}
+of proper texts (one space between `around' and `inclusion',
+and one between `inclusion' and `of').
+
+Als check for
+\begin{thisone}
+multiple paragraphs.
+
+Such as
+\end{thisone}
+here. (`Such as' should be a new paragraph.)
+
+% a test of the special comments
+\specialcomment{smallfry}{\begingroup\rmfamily\footnotesize}{\endgroup}
+%\tracingmacros=2 \tracingcommands=2
+This text is
+\begin{smallfry}
+rather small
+\end{smallfry}
+don't you think? (The `rather small' should be footnotesize.)
+
+And now we disable
+\excludecomment{smallfry}
+\begin{smallfry}
+the special comment
+\end{smallfry}
+environment
+(in between `disable' and `environment' is some excluded material).
+
+% test of weird grouping
+We switch to
+\begin{thisone}
+\bf bold face
+\end{thisone}
+inside \rm a comment. (The phrase `bold face inside' should be bold.)
+
+\newcount\comlines
+\specialcomment{countedcomment}
+ {\comlines=0\relax \def\ProcessCutFile{}%
+ \def\ThisComment##1{\global\advance\comlines1\relax}}
+ {**Comment: \number\comlines\ line(s) removed**}
+
+This is a line of text
+\begin{countedcomment}
+Oneline
+\end{countedcomment}
+another line of text
+\begin{countedcomment}
+One line
+Two line
+Three line
+\end{countedcomment}
+last line of text.
+
+\specialcomment
+ {underlinecomment}
+ {%
+ \def\ProcessCutFile{\input{\CommentCutFile}\relax}% Bug! this
+ % should not be necessary.
+ \def\ThisComment##1{\WriteCommentLine{u: \underline{##1}\par}}
+ \par
+ }
+ {\par}
+
+A block of two underlined lines in between this line
+\begin{underlinecomment}
+line 1
+line 2
+\end{underlinecomment}
+and before this line.
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test_ivo.tex new/doc/latex/comment/comm_test_ivo.tex
--- old/doc/latex/comment/comm_test_ivo.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/comm_test_ivo.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,32 @@
+\documentclass[12pt]{article}
+
+\usepackage{comment}
+\excludecomment{conditional}
+
+\specialcomment{redcomment}{\em\Large}{\tiny}
+
+\begin{document}
+
+plain text.
+
+\newcommand{\Redcomment}[1]{Original Definition. (#1).}
+
+\begin{conditional}
+Conditional Text.
+
+More Conditional Text in next paragraph.
+
+\renewcommand{\Redcomment}[1]{Redefinition Worked! (#1).}
+\end{conditional}
+
+\begin{redcomment}
+the first redcomment paragraph.
+
+the second redcomment paragraph.
+\end{redcomment}
+
+Because redcomment has ended, this should be tiny.
+
+\Redcomment{This is the command line version.}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test_l.tex new/doc/latex/comment/comm_test_l.tex
--- old/doc/latex/comment/comm_test_l.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/comm_test_l.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,78 @@
+% An illustration of comment.sty by Victor Eijkhout.
+% This file belongs to comment.sty version 3.0 or later,
+% it is meant to be used with LaTeX
+
+\documentstyle[comment]{article}
+\begin{document}
+
+\excludecomment{begone}
+
+\includecomment{thisone}
+\excludecomment{notthisone}
+
+% under development \leveledcomment{maybethis}{1}
+
+\parskip=20pt
+This sentence
+\begin{comment}
+has
+\end{comment}
+no verb.
+
+Check for\begin{notthisone}
+superfluous
+\end{notthisone}
+spaces, and
+\begin{thisone}
+inclusion
+\end{thisone}
+of proper texts.
+
+% a test of the special comments
+\newcount\comlines
+\processcomment{countedcomment}
+ {\comlines=0\relax
+ \def\ThisComment##1{\global\advance\comlines1\relax}}
+ {}{\endgraf **Comment: \number\comlines\ line(s) removed**\endgraf}
+
+This is a line of text
+\begin{countedcomment}
+Oneline
+\end{countedcomment}
+another line of text
+\begin{countedcomment}
+One line
+Two line
+Three line
+\end{countedcomment}
+last line of text
+
+Let's test paragraphs:
+\begin{notthisone}
+This one is missing.
+
+As is this one.
+\end{notthisone}
+For starters.
+
+On the other hand:
+\begin{thisone}
+This is one is present.
+
+As is this one.
+\end{thisone}
+And that's it.
+
+\begin{comment} % future project
+\maybethis 0
+Level zero.
+\endmaybethis
+\maybethis 1
+Level one.
+\endmaybethis
+\maybethis 2
+Level two.
+\endmaybethis
+\end{comment}
+
+\end{document}
Binary files old/doc/latex/comment/comment.pdf and new/doc/latex/comment/comment.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comment.tex new/doc/latex/comment/comment.tex
--- old/doc/latex/comment/comment.tex 2010-02-23 01:21:51.000000000 +0100
+++ new/doc/latex/comment/comment.tex 2016-11-25 19:28:27.000000000 +0100
@@ -1,4 +1,4 @@
-\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{scrartcl}
+\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{artikel3}%{scrartcl}
\usepackage{fixltx2e}
\usepackage{etex}
@@ -27,11 +27,12 @@
\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle}
\newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}}
-\addtokomafont{title}{\rmfamily}
+%\addtokomafont{title}{\rmfamily}
-\title{The \pkg{comment} package\thanks{This manual corresponds to \pkg{comment}~v3.6, dated~October 1999.}}
-\author{Victor Eijkhout\\\mail{victor@eijkhout.net}}
-\date{October 1999}
+\title{The \pkg{comment} package\thanks{This manual corresponds to
+ \pkg{comment}~v3.8 of July 2016.}}
+%
+\author{Victor Eijkhout\\\mail{victor@eijkhout.net}} \date{August 2016}
\begin{document}
@@ -40,27 +41,25 @@
\section{Purpose:}
-selectively in/exclude pieces of text: the user can define new
+Selectively in/exclude pieces of text: the user can define new
comment versions, and each is controlled separately.
Special comments can be defined where the user specifies the
action that is to be taken with each comment line.
-This style can be used with plain \TeX\ or \LaTeX, and probably
-most other packages too.
+Plain \TeX\ support has been phased out.
+As of 3.8 the package will increasingly use e\TeX\ features, for
+instance to solve Unicode support issues.
\section{Usage:}
+The `\env{comment}' environment is defined by default:
all text included between
%
\begin{verbatim}
-\comment ... \endcomment
-\end{verbatim}
-%
-or
-%
-\begin{verbatim}
-\begin{comment} ... \end{comment}
+\begin{comment}
+ ...
+\end{comment}
\end{verbatim}
%
is discarded.
@@ -81,27 +80,32 @@
These environments are used as
%
\begin{verbatim}
-\versiona ... \endversiona
-\end{verbatim}
-%
-or
-%
-\begin{verbatim}
-\begin{versiona} ... \end{versiona}
+\begin{versiona}
+ ...
+\end{versiona}
\end{verbatim}
%
with the opening and closing commands again on a line of
their own.
-\pagebreak[1]
-
-\LaTeX\ users note: for an included comment, the
+Note: for an included comment, the
\cmd{\begin} and \cmd{\end} lines act as if they don't exist.
In particular, they don't imply grouping, so assignments
\&c are not local.
-\pagebreak[2]
+Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+):
+%
+\begin{verbatim}
+\includecomment{cond}
+\newcommand{\maybe}[1]{}
+\begin{cond}
+\renewcommand{\maybe}[1]{#1}
+\end{cond}
+\end{verbatim}
+\section{Special comments}
+
+It is possible to make highly customized versions of the comment environment.
Special comments are defined as
%
\begin{noverb}
@@ -111,63 +115,131 @@
where the second and third arguments are executed before
and after each comment block. You can use this for global
formatting commands.
+
To keep definitions \&c local, you can include \cmd{\begingroup}
in the `\meta{before commands}' and \cmd{\endgroup} in the `\meta{after commands}'.
-ex:
+
+Example:
%
\begin{verbatim}
\specialcomment{smalltt}
{\begingroup\ttfamily\footnotesize}{\endgroup}
\end{verbatim}
%
-You do \emph{not} have to do an additional
-%
+Special comments are automatically included.
+
+The comment environments use two auxiliary commands. You can get
+nifty special effects by redefining them.
+
+\subsection{The cutfile}
+
+The commented text is written to an external file, the `cutfile'. Default definition:
\begin{verbatim}
-\includecomment{smalltt}
+ \def\CommentCutFile{comment.cut}
\end{verbatim}
-%
-To remove `\env{smalltt}' blocks, give \verb+\excludecomment{smalltt}+
-after the definition.
-Processing comments can apply processing to each line.
-%
-\begin{noverb}
-\cmd{\processcomment}\marg{name}\marg{each-line commands}\marg{before commands}\marg{after commands}
-\end{noverb}
-%
-By defining a control sequence
-%
+Included comments are processed like this:
\begin{verbatim}
-\def\Thiscomment##1{...}
+ \def\ProcessCutFile{\input{\CommentCutFile}\relax}
+\end{verbatim}
+ and excluded files have
+\begin{verbatim}
+ \def\ProcessCutFile{}
+\end{verbatim}
+
+\begin{itemize}
+\item By redefining the name of the cutfile, the value of the macro
+ \cmd{CommentCutFile}, it becomes possible to have nested comment environments.
+\item If you are writing a textbook, you could have the answers to
+ exercises in your source, but write them to file rather than
+ formatting them:
+\begin{verbatim}
+\generalcomment{answer}
+ {\begingroup
+ \edef\tmp{\def\noexpand\CommentCutFile
+ {answers/\chapshortname-an\noexpand\arabic{excounter}.tex}}\tmp
+ \def\ProcessCutFile{}}
+ {\ifIncludeAnswers \begin{quote}
+ \leavevmode
+ \hbox{\kern-\unitindent
+ \textbf Solution to exercise \arabic{chapter}.\arabic{excounter}.\hspace{1em}}%
+ \ignorespaces\it
+ \input{\CommentCutFile}
+ \end{quote}\fi
+ \endgroup}
+\end{verbatim}
+\end{itemize}
+
+\subsection{Comment inclusion}
+
+The inclusion of the comment is done
+by \cmd{\ProcessCutFile}, so you can redefine that:
+\begin{verbatim}
+ \specialcomment
+ {mathexamplewithcode}
+ {\begingroup\def\ProcessCutFile{}} % arg1
+ {\verbatiminput{\CommentCutFile} % arg2
+ \endgroup
+ This gives:
+ \begin{equation} \input{\CommentCutFile} \end{equation}
+ }
+\end{verbatim}
+The idea here is to disable inclusion of the file,
+but include it in the after commands, in display math.
+
+\subsection{Processing each line}
+
+You can also apply processing to each line.
+By defining a control sequence
+\begin{verbatim}
+ \def\Thiscomment##1{...}
\end{verbatim}
-%
in the before commands the user can
-specify what is to be done with each comment line.
-BUG this does not work quite yet BUG
+specify what is to be done with each comment line. If something
+needs to be written to file, use \verb+\WriteCommentLine{the stuff}+
+Example:
+\begin{verbatim}
+ \specialcomment
+ {underlinecomment}
+ {\def\ThisComment##1{\WriteCommentLine{\underline{##1}\par}}
+ \par}
+ {\par}
+\end{verbatim}
+
+\subsection{More examples}
-Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+):
-%
\begin{verbatim}
-\includecomment{cond}
-\newcommand{\maybe}[1]{}
-\begin{cond}
-\renewcommand{\maybe}[1]{#1}
-\end{cond}
+\newcount\comlines
+\specialcomment{countedcomment}
+ {\comlines=0\relax \def\ProcessCutFile{}%
+ \def\ThisComment##1{\global\advance\comlines1\relax}}
+ {**Comment: \number\comlines\ line(s) removed**}
\end{verbatim}
+\begin{verbatim}
+\specialcomment
+ {underlinecomment}
+ {%
+ \def\ProcessCutFile{\input{\CommentCutFile}\relax}
+ \def\ThisComment##1{\WriteCommentLine{u: \underline{##1}\par}}
+ \par
+ }
+ {\par}
+\end{verbatim}
-\section{Basic approach of the implementation:}
+\section{Unicode support}
-to comment something out, scoop up every line in verbatim mode
-as macro argument, then throw it away.
-For inclusions, in \LaTeX\ the block is written out to
-a file \cmd{\CommentCutFile} (default ``\texttt{comment.cut}''), which is
-then included.
-In plain \TeX\ (and other formats) both the opening and
-closing comands are defined as noop.
+Unicode support works if you use e\TeX, which is for instance the case
+if you use pdflatex. You need the following lines:
+\begin{verbatim}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\end{verbatim}
+in your preamble.
+\section{Change log}
-\section{Changes in version 3.1}
+\subsection{Changes in version 3.1}
\begin{itemize}
\item updated author's address
@@ -188,14 +260,14 @@
\end{itemize}
-\section{Changes in 3.2}
+\subsection{Changes in 3.2}
\begin{itemize}
\item \cmd{\specialcomment} brought up to date (thanks to Ivo Welch).
\end{itemize}
-\section{Changes in 3.3}
+\subsection{Changes in 3.3}
\begin{itemize}
\item updated author's address again
@@ -203,7 +275,7 @@
\end{itemize}
-\section{Changes in 3.4}
+\subsection{Changes in 3.4}
\begin{itemize}
\item added GNU public license
@@ -212,7 +284,7 @@
\end{itemize}
-\section{Changes in 3.5}
+\subsection{Changes in 3.5}
\begin{itemize}
\item corrected typo in header.
@@ -222,7 +294,7 @@
\end{itemize}
-\section{Changes in 3.6}
+\subsection{Changes in 3.6}
\begin{itemize}
\item The `cut' file is now written more verbatim, using \cmd{\meaning};
@@ -232,11 +304,8 @@
\end{itemize}
-\section{Known bugs:}
+\subsection{Changes in 3.8}
-\begin{itemize}
-\item \texttt{excludecomment} leads to one superfluous space
-\item \texttt{processcomment} leads to a superfluous line break
-\end{itemize}
+T1 font encoding is now supported. See t1test.tex.
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comment_plain.tex new/doc/latex/comment/comment_plain.tex
--- old/doc/latex/comment/comment_plain.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/comment_plain.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,263 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Comment.sty version 3.5, August 1998
+%
+% Purpose:
+% selectively in/exclude pieces of text: the user can define new
+% comment versions, and each is controlled separately.
+% Special comments can be defined where the user specifies the
+% action that is to be taken with each comment line.
+%
+% Author
+% Victor Eijkhout
+% Department of Computer Science
+% University of Tennessee
+% 107 Ayres Hall
+% Knoxville TN 37996
+% USA
+%
+% victor@eijkhout.net
+%
+% This program is free software; you can redistribute it and/or
+% modify it under the terms of the GNU General Public License
+% as published by the Free Software Foundation; either version 2
+% of the License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% For a copy of the GNU General Public License, write to the
+% Free Software Foundation, Inc.,
+% 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA,
+% or find it on the net, for instance at
+% http://www.gnu.org/copyleft/gpl.html
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This style can be used with plain TeX or LaTeX, and probably
+% most other packages too.
+%
+% Usage: all text included between
+% \comment ... \endcomment
+% or \begin{comment} ... \end{comment}
+% is discarded.
+%
+% The opening and closing commands should appear on a line
+% of their own. No starting spaces, nothing after it.
+% This environment should work with arbitrary amounts
+% of comment, and the comment can be arbitrary text.
+%
+% Other `comment' environments are defined by
+% and are selected/deselected with
+% \includecomment{versiona}
+% \excludecoment{versionb}
+%
+% These environments are used as
+% \versiona ... \endversiona
+% or \begin{versiona} ... \end{versiona}
+% with the opening and closing commands again on a line of
+% their own.
+%
+% LaTeX users note: for an included comment, the
+% \begin and \end lines act as if they don't exist.
+% In particular, they don't imply grouping, so assignments
+% &c are not local.
+%
+% Special comments are defined as
+% \specialcomment{name}{before commands}{after commands}
+% where the second and third arguments are executed before
+% and after each comment block. You can use this for global
+% formatting commands.
+% To keep definitions &c local, you can include \begingroup
+% in the `before commands' and \endgroup in the `after commands'.
+% ex:
+% \specialcomment{smalltt}
+% {\begingroup\ttfamily\footnotesize}{\endgroup}
+% You do *not* have to do an additional
+% \includecomment{smalltt}
+% To remove 'smalltt' blocks, give \excludecomment{smalltt}
+% after the definition.
+%
+% Processing comments can apply processing to each line.
+% \processcomment{name}{each-line commands}%
+% {before commands}{after commands}
+% By defining a control sequence
+% \def\Thiscomment##1{...} in the before commands the user can
+% specify what is to be done with each comment line.
+% BUG this does not work quite yet BUG
+%
+% Trick for short in/exclude macros (such as \maybe{this snippet}):
+%\includecomment{cond}
+%\newcommand{\maybe}[1]{}
+%\begin{cond}
+%\renewcommand{\maybe}[1]{#1}
+%\end{cond}
+%
+% Basic approach of the implementation:
+% to comment something out, scoop up every line in verbatim mode
+% as macro argument, then throw it away.
+% For inclusions, in LaTeX the block is written out to
+% a file \CommentCutFile (default "comment.cut"), which is
+% then included.
+% In plain TeX (and other formats) both the opening and
+% closing comands are defined as noop.
+%
+% Changes in version 3.1
+% - updated author's address
+% - cleaned up some code
+% - trailing contents on \begin{env} line is always discarded
+% even if you've done \includecomment{env}
+% - comments no longer define grouping!! you can even
+% \includecomment{env}
+% \begin{env}
+% \begin{itemize}
+% \end{env}
+% Isn't that something ...
+% - included comments are written to file and input again.
+% Changes in 3.2
+% - \specialcomment brought up to date (thanks to Ivo Welch).
+% Changes in 3.3
+% - updated author's address again
+% - parametrised \CommentCutFile
+% Changes in 3.4
+% - added GNU public license
+% - added \processcomment, because Ivo's fix (above) brought an
+% inconsistency to light.
+% Changes in 3.5
+% - corrected typo in header.
+% - changed author email
+% - corrected \specialcomment yet again.
+% - fixed excludecomment of an earlier defined environment.
+%
+% Known bugs:
+% - excludecomment leads to one superfluous space
+% - processcomment leads to a superfluous line break
+%
+\def\makeinnocent#1{\catcode`#1=12 }
+\def\csarg#1#2{\expandafter#1\csname#2\endcsname}
+\def\latexname{lplain}\def\latexename{LaTeX2e}
+\newwrite\CommentStream
+\def\CommentCutFile{comment.cut}
+
+\def\ProcessComment#1% start it all of
+ {\begingroup
+ \def\CurrentComment{#1}%
+ \let\do\makeinnocent \dospecials
+ \makeinnocent\^^L% and whatever other special cases
+ \endlinechar`\^^M \catcode`\^^M=12 \xComment}
+%\def\ProcessCommentWithArg#1#2% to be used in \leveledcomment
+% {\begingroup
+% \def\CurrentComment{#1}%
+% \let\do\makeinnocent \dospecials
+% \makeinnocent\^^L% and whatever other special cases
+% \endlinechar`\^^M \catcode`\^^M=12 \xComment}
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\xComment#1^^M{%
+ \expandafter\ProcessCommentLine}
+ \gdef\ProcessCommentLine#1^^M{\def\test{#1}
+ \csarg\ifx{End\CurrentComment Test}\test
+ \edef\next{\noexpand\EndOfComment{\CurrentComment}}%
+ \else \ThisComment{#1}\let\next\ProcessCommentLine
+ \fi \next}
+}
+
+% 3.1 change: in LaTeX and LaTeX2e prevent grouping
+\if 0%
+\ifx\fmtname\latexename
+ 0%
+\else \ifx\fmtname\latexname
+ 0%
+ \else
+ 1%
+\fi \fi
+%%%%
+%%%% definitions for LaTeX
+%%%%
+\def\AfterIncludedComment
+ {\immediate\closeout\CommentStream
+ \input{\CommentCutFile}\relax
+ }%
+\def\TossComment{\immediate\closeout\CommentStream}
+\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}}
+\def\BeforeIncludedComment
+ {\immediate\openout\CommentStream=\CommentCutFile
+ \let\ThisComment\WriteCommentLine}
+\def\includecomment
+ #1{\message{Include comment '#1'}%
+ \csarg\let{After#1Comment}\AfterIncludedComment
+ \csarg\def{#1}{\BeforeIncludedComment
+ \ProcessComment{#1}}%
+ \CommentEndDef{#1}}
+\long\def\specialcomment
+ #1#2#3{\message{Special comment '#1'}%
+ % note: \AfterIncludedComment does \input, so #2 goes here!
+ \csarg\def{After#1Comment}{#2\AfterIncludedComment#3}%
+ \csarg\def{#1}{\BeforeIncludedComment\relax
+ \ProcessComment{#1}}%
+ \CommentEndDef{#1}}
+\long\def\processcomment
+ #1#2#3#4{\message{Lines-Processing comment '#1'}%
+ \csarg\def{After#1Comment}{#3\AfterIncludedComment#4}%
+ \csarg\def{#1}{\BeforeIncludedComment#2\relax
+ \ProcessComment{#1}}%
+ \CommentEndDef{#1}}
+\def\leveledcomment
+ #1#2{\message{Include comment '#1' up to level '#2'}%
+ %\csarg\newif{if#1IsStreamingComment}
+ %\csarg\newif{if#1IsLeveledComment}
+ %\csname #1IsLeveledCommenttrue\endcsname
+ \csarg\let{After#1Comment}\AfterIncludedComment
+ \csarg\def{#1}{\BeforeIncludedComment
+ \ProcessCommentWithArg{#1}}%
+ \CommentEndDef{#1}}
+\else
+%%%%
+%%%%plain TeX and other formats
+%%%%
+\def\includecomment
+ #1{\message{Including comment '#1'}%
+ \csarg\def{#1}{}%
+ \csarg\def{end#1}{}}
+\long\def\specialcomment
+ #1#2#3{\message{Special comment '#1'}%
+ \csarg\newif{if#1IsStreamingComment}
+ \csarg\def{#1}{\def\ThisComment{}\def\AfterComment{#3}#2%
+ \ProcessComment{#1}}%
+ \CommentEndDef{#1}}
+\fi
+
+%%%%
+%%%% general definition of skipped comment
+%%%%
+\def\excludecomment
+ #1{\message{Excluding comment '#1'}%
+ \csarg\def{#1}{\let\AfterComment\relax
+ \def\ThisComment####1{}\ProcessComment{#1}}%
+ \csarg\let{After#1Comment}\TossComment
+ \CommentEndDef{#1}}
+
+\if 0%
+\ifx\fmtname\latexename
+ 0%
+\else \ifx\fmtname\latexname
+ 0%
+ \else
+ 1%
+\fi \fi
+% latex & latex2e:
+\def\EndOfComment#1{\endgroup\end{#1}%
+ \csname After#1Comment\endcsname}
+\def\CommentEndDef#1{{\escapechar=-1\relax
+ \csarg\xdef{End#1Test}{\string\\end\string\{#1\string\}}%
+ }}
+\else
+% plain & other
+\def\EndOfComment#1{\endgroup\AfterComment}
+\def\CommentEndDef#1{{\escapechar=-1\relax
+ \csarg\xdef{End#1Test}{\string\\end#1}%
+ }}
+\fi
+
+\excludecomment{comment}
+
+\endinput
Binary files old/doc/latex/comment/t1test.pdf and new/doc/latex/comment/t1test.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/t1test.tex new/doc/latex/comment/t1test.tex
--- old/doc/latex/comment/t1test.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/t1test.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,24 @@
+\documentclass{article}
+
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+
+\usepackage{comment}
+\includecomment{mention}
+
+%% set-language-environment UTF-8
+
+\begin{document}
+
+Yes:
+\begin{mention}
+Ð
+\end{mention}
+.
+
+No:
+\begin{comment}
+Ñ
+\end{comment}
+.
+\end{document}
Binary files old/doc/latex/comment/writeup.pdf and new/doc/latex/comment/writeup.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/writeup.tex new/doc/latex/comment/writeup.tex
--- old/doc/latex/comment/writeup.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/comment/writeup.tex 2016-11-25 19:28:27.000000000 +0100
@@ -0,0 +1,244 @@
+\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{scrartcl}
+
+\usepackage{fixltx2e}
+\usepackage{etex}
+\usepackage{xspace}
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{microtype}
+\usepackage[unicode=true]{hyperref}
+
+\newenvironment*{noverb}{%
+ \flushleft
+ \vskip\parskip
+ \parskip=0pt\relax
+}{%
+ \endflushleft
+}
+
+\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
+\newcommand*{\pkg}[1]{\textsf{#1}}
+\newcommand*{\cs}[1]{\texttt{\textbackslash#1}}
+\makeatletter
+\newcommand*{\cmd}[1]{\cs{\expandafter\@gobble\string#1}}
+\makeatother
+\newcommand*{\env}[1]{\texttt{#1}}
+\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle}
+\newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}}
+
+\addtokomafont{title}{\rmfamily}
+
+\title{The \pkg{comment} package\thanks{This manual corresponds to
+ \pkg{comment}~v3.8 of July 2016.}}
+%
+\author{Victor Eijkhout\\\mail{victor@eijkhout.net}} \date{August 2016}
+
+
+\begin{document}
+
+\maketitle
+
+\section{Purpose:}
+
+Selectively in/exclude pieces of text: the user can define new
+comment versions, and each is controlled separately.
+Special comments can be defined where the user specifies the
+action that is to be taken with each comment line.
+
+Plain \TeX\ support has been phased out.
+
+As of 3.8 the package will increasingly use e\TeX\ features, for
+instance to solve Unicode support issues.
+
+\section{Usage:}
+
+All text included between
+%
+\begin{verbatim}
+\begin{comment}
+ ...
+\end{comment}
+\end{verbatim}
+%
+is discarded.
+
+The opening and closing commands should appear on a line
+of their own. No starting spaces, nothing after it.
+This environment should work with arbitrary amounts
+of comment, and the comment can be arbitrary text.
+
+Other `\env{comment}' environments are defined by
+and are selected/deselected with
+%
+\begin{verbatim}
+\includecomment{versiona}
+\excludecoment{versionb}
+\end{verbatim}
+%
+These environments are used as
+%
+\begin{verbatim}
+\versiona ... \endversiona
+\end{verbatim}
+%
+or
+%
+\begin{verbatim}
+\begin{versiona} ... \end{versiona}
+\end{verbatim}
+%
+with the opening and closing commands again on a line of
+their own.
+
+\pagebreak[1]
+
+\LaTeX\ users note: for an included comment, the
+\cmd{\begin} and \cmd{\end} lines act as if they don't exist.
+In particular, they don't imply grouping, so assignments
+\&c are not local.
+
+\pagebreak[2]
+
+Special comments are defined as
+%
+\begin{noverb}
+\cmd{\specialcomment}\marg{name}\marg{before commands}\marg{after commands}
+\end{noverb}
+%
+where the second and third arguments are executed before
+and after each comment block. You can use this for global
+formatting commands.
+To keep definitions \&c local, you can include \cmd{\begingroup}
+in the `\meta{before commands}' and \cmd{\endgroup} in the `\meta{after commands}'.
+ex:
+%
+\begin{verbatim}
+\specialcomment{smalltt}
+ {\begingroup\ttfamily\footnotesize}{\endgroup}
+\end{verbatim}
+%
+You do \emph{not} have to do an additional
+%
+\begin{verbatim}
+\includecomment{smalltt}
+\end{verbatim}
+%
+To remove `\env{smalltt}' blocks, give \verb+\excludecomment{smalltt}+
+after the definition.
+
+Processing comments can apply processing to each line.
+%
+\begin{noverb}
+\cmd{\processcomment}\marg{name}\marg{each-line commands}\marg{before commands}\marg{after commands}
+\end{noverb}
+%
+By defining a control sequence
+%
+\begin{verbatim}
+\def\Thiscomment##1{...}
+\end{verbatim}
+%
+in the before commands the user can
+specify what is to be done with each comment line.
+BUG this does not work quite yet BUG
+
+Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+):
+%
+\begin{verbatim}
+\includecomment{cond}
+\newcommand{\maybe}[1]{}
+\begin{cond}
+\renewcommand{\maybe}[1]{#1}
+\end{cond}
+\end{verbatim}
+
+
+\section{Basic approach of the implementation:}
+
+to comment something out, scoop up every line in verbatim mode
+as macro argument, then throw it away.
+For inclusions, in \LaTeX\ the block is written out to
+a file \cmd{\CommentCutFile} (default ``\texttt{comment.cut}''), which is
+then included.
+In plain \TeX\ (and other formats) both the opening and
+closing comands are defined as noop.
+
+
+\section{Changes in version 3.1}
+
+\begin{itemize}
+\item updated author's address
+\item cleaned up some code
+\item trailing contents on \cmd{\begin}\marg{env} line is always discarded
+ even if you've done \cmd{\includecomment}\marg{env}
+\item comments no longer define grouping!! you can even
+ %
+\begin{verbatim}
+\includecomment{env}
+\begin{env}
+\begin{itemize}
+\end{env}
+\end{verbatim}
+ %
+ Isn't that something\ldots
+\item included comments are written to file and input again.
+\end{itemize}
+
+
+\section{Changes in 3.2}
+
+\begin{itemize}
+\item \cmd{\specialcomment} brought up to date (thanks to Ivo Welch).
+\end{itemize}
+
+
+\section{Changes in 3.3}
+
+\begin{itemize}
+\item updated author's address again
+\item parametrised \cmd{\CommentCutFile}
+\end{itemize}
+
+
+\section{Changes in 3.4}
+
+\begin{itemize}
+\item added GNU public license
+\item added \cmd{\processcomment}, because Ivo's fix (above) brought an
+ inconsistency to light.
+\end{itemize}
+
+
+\section{Changes in 3.5}
+
+\begin{itemize}
+\item corrected typo in header.
+\item changed author email
+\item corrected \cmd{\specialcomment} yet again.
+\item fixed excludecomment of an earlier defined environment.
+\end{itemize}
+
+
+\section{Changes in 3.6}
+
+\begin{itemize}
+\item The `cut' file is now written more verbatim, using \cmd{\meaning};
+ some people reported having trouble with ISO~latin~1, or \texttt{umlaute.sty}.
+\item removed some \cmd{\newif} statements.
+ Has this suddenly become \cmd{\outer} again?
+\end{itemize}
+
+
+\section{Changes in 3.8}
+
+T1 font encoding is now supported. See t1test.tex.
+
+%% \section{Known bugs:}
+
+%% \begin{itemize}
+%% \item \texttt{excludecomment} leads to one superfluous space
+%% \item \texttt{processcomment} leads to a superfluous line break
+%% \end{itemize}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comment.doc.tlpobj new/tlpkg/tlpobj/comment.doc.tlpobj
--- old/tlpkg/tlpobj/comment.doc.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/comment.doc.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -1,10 +1,20 @@
name comment.doc
category Package
-revision 32778
+revision 41927
shortdesc doc files of comment
relocated 1
-docfiles size=68
+docfiles size=145
+ RELOC/doc/latex/comment/Makefile
RELOC/doc/latex/comment/README
- RELOC/doc/latex/comment/comm_latest.tex
+ RELOC/doc/latex/comment/comm_bug.tex
+ RELOC/doc/latex/comment/comm_test.pdf
+ RELOC/doc/latex/comment/comm_test.tex
+ RELOC/doc/latex/comment/comm_test_ivo.tex
+ RELOC/doc/latex/comment/comm_test_l.tex
RELOC/doc/latex/comment/comment.pdf
RELOC/doc/latex/comment/comment.tex
+ RELOC/doc/latex/comment/comment_plain.tex
+ RELOC/doc/latex/comment/t1test.pdf
+ RELOC/doc/latex/comment/t1test.tex
+ RELOC/doc/latex/comment/writeup.pdf
+ RELOC/doc/latex/comment/writeup.tex
++++++ comment.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/comment/comment.sty new/tex/latex/comment/comment.sty
--- old/tex/latex/comment/comment.sty 2014-01-25 00:00:16.000000000 +0100
+++ new/tex/latex/comment/comment.sty 2016-11-25 19:33:45.000000000 +0100
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Comment.sty version 3.7, July 2009
-% copyright 1998-2009 Victor Eijkhout
+% Comment.sty version 3.8, July 2016
+% copyright 1998-2016 Victor Eijkhout
%
% Purpose:
% selectively in/exclude pieces of text: the user can define new
@@ -115,7 +115,7 @@
% needs to be written to file, use \WriteCommentLine{the stuff}
% Example:
% \specialcomment{underlinecomment}
-% {\def\ThisComment##1{\WriteCommentLine{\string\underline{##1}\string\par}}
+% {\def\ThisComment##1{\WriteCommentLine{\underline{##1}\par}}
% \par}
% {\par}
%
@@ -126,6 +126,9 @@
%\renewcommand{\maybe}[1]{#1}
%\end{cond}
%
+% Changes in 3.8
+% - utf8 is now correctly handled, at least if you use eTeX.
+% (Thanks Henry Gregory for the solution)
% Changes in 3.7
% - only LaTeX support from now on
% - code cleanup, and improvements on \specialcomment
@@ -192,22 +195,37 @@
%%
%% Initial action: SetUpCutFile opens the CommentCutFile
+%% hook for initial actions: PrepareCutFile, default null
%%
\def\SetUpCutFile
- {\immediate\openout\CommentStream=\CommentCutFile}
-%%
-%% Each line action: ThisComment, default: WriteCommentLine on line contents
+ {\immediate\openout\CommentStream=\CommentCutFile
+ \PrepareCutFile}
+\def\PrepareCutFile{}
+
%%
-\long\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}}
+%% Each line action: ThisComment,
+%% default: WriteCommentLine on line contents
+%% version 3.8: write unexpanded if using eTeX
+%%
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+ \long\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}}
+\else
+ \long\def\WriteCommentLine#1{\immediate\write\CommentStream{\unexpanded{#1}}}
+\fi
\let\ThisComment\WriteCommentLine
+
%%
%% Final action: ProcessCutFile
+%% hook for final action before file closing: FinalizeCutFile, default null
+%%
\def\ProcessCutFile
{\message{Straight input of \CommentCutFile.}%
\input{\CommentCutFile}\relax}
\def\CloseAndInputCutFile
- {\immediate\closeout\CommentStream
+ {\FinalizeCutFile
+ \immediate\closeout\CommentStream
\ProcessCutFile}
+\def\FinalizeCutFile{}
%%
%% Define the different comment types
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comment.tlpobj new/tlpkg/tlpobj/comment.tlpobj
--- old/tlpkg/tlpobj/comment.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/comment.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -1,7 +1,7 @@
name comment
category Package
-revision 32778
-shortdesc Selectively include/excludes portions of text
+revision 41927
+shortdesc Selectively include/exclude portions of text
relocated 1
longdesc Selectively include/exclude pieces of text, allowing the user
longdesc to define new, separately controlled, comment versions. All
@@ -19,7 +19,7 @@
runfiles size=3
RELOC/tex/latex/comment/comment.sty
catalogue-ctan /macros/latex/contrib/comment
-catalogue-date 2015-08-03 05:43:12 +0200
-catalogue-license gpl
+catalogue-date 2016-08-25 07:53:37 +0200
+catalogue-license gpl2
catalogue-topics cond-comp editorial
-catalogue-version 3.7
+catalogue-version 3.8
++++++ compactbib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/compactbib.tlpobj new/tlpkg/tlpobj/compactbib.tlpobj
--- old/tlpkg/tlpobj/compactbib.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/compactbib.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -8,6 +8,6 @@
runfiles size=2
RELOC/tex/latex/compactbib/compactbib.sty
catalogue-ctan /macros/latex/contrib/compactbib
-catalogue-date 2015-12-27 20:31:23 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-supp
++++++ complexity.doc.tar.xz ++++++
++++++ complexity.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/complexity.tlpobj new/tlpkg/tlpobj/complexity.tlpobj
--- old/tlpkg/tlpobj/complexity.tlpobj 2016-04-14 18:52:43.000000000 +0200
+++ new/tlpkg/tlpobj/complexity.tlpobj 2017-04-14 17:36:14.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/latex/complexity/complexity.sty
RELOC/tex/latex/complexity/mycomplexity.sty
catalogue-ctan /macros/latex/contrib/complexity
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-symb
catalogue-version 0.76
++++++ components-of-TeX.doc.tar.xz ++++++
++++++ comprehensive.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-e/comprehensive.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/comprehensive.doc.tar.xz differ: char 26, line 1
++++++ computational-complexity.doc.tar.xz ++++++
++++++ computational-complexity.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/computational-complexity.tlpobj new/tlpkg/tlpobj/computational-complexity.tlpobj
--- old/tlpkg/tlpobj/computational-complexity.tlpobj 2016-04-14 18:53:18.000000000 +0200
+++ new/tlpkg/tlpobj/computational-complexity.tlpobj 2017-04-14 17:36:29.000000000 +0200
@@ -35,7 +35,7 @@
RELOC/tex/latex/computational-complexity/relabel.sty
RELOC/tex/latex/computational-complexity/thcc.sty
catalogue-ctan /macros/latex/contrib/computational-complexity
-catalogue-date 2016-03-01 13:14:04 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics journalpub class
catalogue-version 2.25f
++++++ concepts.doc.tar.xz ++++++
++++++ concepts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/concepts.tlpobj new/tlpkg/tlpobj/concepts.tlpobj
--- old/tlpkg/tlpobj/concepts.tlpobj 2016-04-14 18:53:18.000000000 +0200
+++ new/tlpkg/tlpobj/concepts.tlpobj 2017-04-14 17:36:29.000000000 +0200
@@ -16,7 +16,7 @@
runfiles size=7
RELOC/tex/latex/concepts/concepts.sty
catalogue-ctan /macros/latex/contrib/concepts
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics editorial-consistency
catalogue-version 0.0.5-r1
++++++ concmath.doc.tar.xz ++++++
++++++ concmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/concmath.tlpobj new/tlpkg/tlpobj/concmath.tlpobj
--- old/tlpkg/tlpobj/concmath.tlpobj 2016-04-14 18:53:19.000000000 +0200
+++ new/tlpkg/tlpobj/concmath.tlpobj 2017-04-14 17:36:30.000000000 +0200
@@ -19,6 +19,6 @@
RELOC/tex/latex/concmath/uccb.fd
catalogue-also concrete ccfonts
catalogue-ctan /macros/latex/contrib/concmath
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp