openSUSE Commits

Download

commit@lists.opensuse.org

June 2017

1 participants
2052 discussions

commit texlive-specs-c for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-c for openSUSE:Factory checked in at 2017-06-25 19:21:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-c (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-c" Sun Jun 25 19:21:21 2017 rev:27 rq:504790 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-c/texlive-specs-c.changes 2017-06-08 14:54:01.619033108 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-c.new/texlive-specs-c.changes 2017-06-25 19:22:51.614106778 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)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(a)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(a)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(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- binomexp.doc.tar.xz binomexp.tar.xz biocon.doc.tar.xz biocon.tar.xz bitelist.doc.tar.xz bitelist.tar.xz bitpattern.doc.tar.xz bitpattern.tar.xz bizcard.doc.tar.xz bizcard.tar.xz blacklettert1.doc.tar.xz blacklettert1.tar.xz blindtext.doc.tar.xz blindtext.tar.xz blkarray.doc.tar.xz blkarray.tar.xz blochsphere.doc.tar.xz blochsphere.tar.xz block.doc.tar.xz block.tar.xz blockdraw_mp.doc.tar.xz blockdraw_mp.tar.xz bloques.doc.tar.xz bloques.tar.xz blox.doc.tar.xz blox.tar.xz bnumexpr.doc.tar.xz bnumexpr.tar.xz bodegraph.doc.tar.xz bodegraph.tar.xz bohr.doc.tar.xz bohr.tar.xz boisik.doc.tar.xz boisik.tar.xz boites.doc.tar.xz boites.tar.xz bold-extra.doc.tar.xz bold-extra.tar.xz boldtensors.doc.tar.xz boldtensors.tar.xz bondgraph.doc.tar.xz bondgraph.tar.xz bondgraphs.doc.tar.xz bondgraphs.tar.xz New: ---- basque-date.doc.tar.xz basque-date.tar.xz bbcard.doc.tar.xz bbcard.tar.xz bbding.doc.tar.xz bbding.tar.xz bbm-macros.doc.tar.xz bbm-macros.tar.xz bbm.doc.tar.xz bbm.tar.xz bbold-type1.doc.tar.xz bbold-type1.tar.xz bbold.doc.tar.xz bbold.tar.xz bbold_bbold11.dif bchart.doc.tar.xz bchart.tar.xz bclogo.doc.tar.xz bclogo.tar.xz beamer-FUBerlin.doc.tar.xz beamer.doc.tar.xz beamer.tar.xz beamerswitch.doc.tar.xz beamerswitch.tar.xz beamertheme-cuerna.doc.tar.xz beamertheme-cuerna.tar.xz beuron.doc.tar.xz beuron.tar.xz biblatex-archaeology.doc.tar.xz biblatex-archaeology.tar.xz biblatex-arthistory-bonn.doc.tar.xz biblatex-arthistory-bonn.tar.xz biblatex-cheatsheet.doc.tar.xz biblatex-claves.doc.tar.xz biblatex-claves.tar.xz biblatex-gb7714-2015.doc.tar.xz biblatex-gb7714-2015.tar.xz biblatex-ijsra.doc.tar.xz biblatex-ijsra.tar.xz biblatex-lni.doc.tar.xz biblatex-lni.tar.xz biblatex-nottsclassic.doc.tar.xz biblatex-nottsclassic.tar.xz biblatex-oxref.doc.tar.xz biblatex-oxref.tar.xz biblatex-sbl.doc.tar.xz biblatex-sbl.tar.xz biblatex-shortfields.doc.tar.xz biblatex-shortfields.tar.xz binarytree.doc.tar.xz binarytree.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-c.spec ++++++ ++++ 22098 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-c/texlive-specs-c.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-c.new/texlive-specs-c.spec ++++++ bitpattern.doc.tar.xz -> bbcard.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bitpattern/README.md new/doc/latex/bitpattern/README.md --- old/doc/latex/bitpattern/README.md 2015-12-12 00:13:48.000000000 +0100 +++ new/doc/latex/bitpattern/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# bitpattern LaTeX package - -A LaTeX package by Jean-Marc Bourguet <jm(a)bourguet.org> to generate bit -pattern diagrams such as those used to describe hardware, data format or -protocols. - -Run LaTeX on the file `bitpattern.ins` to get a .sty to place in your tex -hierarchy. - -Run LaTeX on the file `bitpattern.dtx` to get a manual. If the -`\OnlyDescription` command is commented out, you get commented sources in -the manual, else you get only the user's manual part. - -This program is provided under the terms of the LaTeX Project Public -License distributed from CTAN archives in directory -macros/latex/base/lppl.txt. - -This program is hosted at `https://bitbucket.org/bourguet/bitpattern`. The -best way to report issues and to suggest improvements is with the issue -tracker there. Binary files old/doc/latex/bitpattern/bitpattern.pdf and new/doc/latex/bitpattern/bitpattern.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/bbcard/README.TEXLIVE new/doc/metapost/bbcard/README.TEXLIVE --- old/doc/metapost/bbcard/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/metapost/bbcard/README.TEXLIVE 2016-11-25 19:30:39.000000000 +0100 @@ -0,0 +1,7 @@ +The following files have been removed in the TeX Live installation of +the current package, typically due to duplication, lack of space, or +missing source code. You can find these files on CTAN at + http://mirror.ctan.org/graphics/metapost/contrib/macros/bbcard +If questions or concerns, email tex-live(a)tug.org. + + bbcard.tpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/bbcard/README.bbcard new/doc/metapost/bbcard/README.bbcard --- old/doc/metapost/bbcard/README.bbcard 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/metapost/bbcard/README.bbcard 2016-11-25 19:30:39.000000000 +0100 @@ -0,0 +1,45 @@ +Bullshit Bingo + +This is a metapost implementation of Bullshit Bingo. It's based on +http://www.perkigoth.com/home/kermit/stuff/BullshitBingo. I've taken +additional phrases from http://www.lssu.edu/banished. + +To be perfectly honest, I wrote this because I needed a meaningful, +client-focused playing card which could be the best of breed. I +basically felt that I could use my best practices to bring a total +quality approach to the challenge. Having said that, the actual fact is +I also wanted to control the list of words. This version is not +web-enabled, but it has a few value-added features which should empower +employees, and put them on the critical path towards realising their +core competencies: + +-- dynamic logo-style heading +-- four grids per card -- speaks to serious play +-- user-friendly method of generating many cards at once +-- more than 100 very unique bullshit phrases +-- it's easy to add and remove phrases, so you can be proactive, + not reactive + +-- + +To generate a single card: + mpost bbcard +and the card will be written to bbcard.ps + +To generate 12 cards: + mpost '\nocards:=12; input bbcard' +and the cards will be written to bbcard.1, bbcard.2, .., bbcard.12 + +Those command-lines assume a recent Unix installation. On your +machine, metapost might be called mp rather than mpost, and the +single-quotes might not be necessary. bbcard requires your installation +to be configured to use the font ptmr8r (Times Roman). It is not +suitable for use with the CM fonts. + +bbcard.mp contains instructions for adding additional phrases. +breakwidth.mp can be used to perform simple-minded line breaking +with other metapost routines. + +bbcard.mp is released to the public domain +breakwidth.mp is copyright by patrick mcphee, but there are +no limitations on its use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/bbcard/README.calendar new/doc/metapost/bbcard/README.calendar --- old/doc/metapost/bbcard/README.calendar 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/metapost/bbcard/README.calendar 2016-11-25 19:30:39.000000000 +0100 @@ -0,0 +1,38 @@ +Calendar + +This is a metapost calendar, which I use to mark down appointments. +It prints one month per page, and can generate an entire year's +with one command. + +To generate the next month's calendar: + mpost calendar +and the card will be written to bbcard.{number}, where {number} is +the month number. One drawback: some common metapost implementations +don't determine the month dynamically, but instead report the month +of compilation or the month of the last change to the code or something +like that. In that case, you must set theyear and themonth as indicated +below: + +To generate a year's worth: + mpost '\theyear:=2003; themonth:=-1; input calendar' + +To generate April 2003: + mpost '\theyear:=2003; themonth:=4; input calendar' + +Those command-lines assume a recent Unix installation. On your +machine, metapost might be called mp rather than mpost, and the +single-quotes might not be necessary. calendar requires your installation +to be configured to use the font pplr8r (Palatino). It is not +suitable for use with the CM fonts. + +I've included a few holidays, which I called brands for some reason +I don't recall. You can remove them or add more by setting the values +of the approriate element of the `brands' array. For instance: + + brands[7][4] := "Independance Day"; + +sets the US independance day, which is July 4. + +You are free to enhance this file or integrate it with other packages +if you like. If you do something splendid like adding support for +floating holidays, send them to me and I'll update the package on CTAN. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/bbcard/README.scorecard new/doc/metapost/bbcard/README.scorecard --- old/doc/metapost/bbcard/README.scorecard 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/metapost/bbcard/README.scorecard 2016-11-25 19:30:39.000000000 +0100 @@ -0,0 +1,11 @@ +Baseball score card + +This card can be used to score any baseball game which lasts fewer +than twelve innings. Dave Rebnord added the little grey diamonds. + +To generate: + mpost scorecard +and the card will be written to scorecard.ps. + +You are free to enhance this file or integrate it with other packages +if you like. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bbcard.doc.tlpobj new/tlpkg/tlpobj/bbcard.doc.tlpobj --- old/tlpkg/tlpobj/bbcard.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/bbcard.doc.tlpobj 2017-04-14 17:29:51.000000000 +0200 @@ -0,0 +1,10 @@ +name bbcard.doc +category Package +revision 19440 +shortdesc doc files of bbcard +relocated 1 +docfiles size=4 + RELOC/doc/metapost/bbcard/README.TEXLIVE + RELOC/doc/metapost/bbcard/README.bbcard + RELOC/doc/metapost/bbcard/README.calendar + RELOC/doc/metapost/bbcard/README.scorecard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bitpattern.doc.tlpobj new/tlpkg/tlpobj/bitpattern.doc.tlpobj --- old/tlpkg/tlpobj/bitpattern.doc.tlpobj 2016-04-14 18:47:30.000000000 +0200 +++ new/tlpkg/tlpobj/bitpattern.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name bitpattern.doc -category Package -revision 39073 -shortdesc doc files of bitpattern -relocated 1 -docfiles size=44 - RELOC/doc/latex/bitpattern/README.md - RELOC/doc/latex/bitpattern/bitpattern.pdf ++++++ bitpattern.doc.tar.xz -> bbcard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bitpattern/README.md new/doc/latex/bitpattern/README.md --- old/doc/latex/bitpattern/README.md 2015-12-12 00:13:48.000000000 +0100 +++ new/doc/latex/bitpattern/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# bitpattern LaTeX package - -A LaTeX package by Jean-Marc Bourguet <jm(a)bourguet.org> to generate bit -pattern diagrams such as those used to describe hardware, data format or -protocols. - -Run LaTeX on the file `bitpattern.ins` to get a .sty to place in your tex -hierarchy. - -Run LaTeX on the file `bitpattern.dtx` to get a manual. If the -`\OnlyDescription` command is commented out, you get commented sources in -the manual, else you get only the user's manual part. - -This program is provided under the terms of the LaTeX Project Public -License distributed from CTAN archives in directory -macros/latex/base/lppl.txt. - -This program is hosted at `https://bitbucket.org/bourguet/bitpattern`. The -best way to report issues and to suggest improvements is with the issue -tracker there. Binary files old/doc/latex/bitpattern/bitpattern.pdf and new/doc/latex/bitpattern/bitpattern.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/bbcard/bbcard.mp new/metapost/bbcard/bbcard.mp --- old/metapost/bbcard/bbcard.mp 1970-01-01 01:00:00.000000000 +0100 +++ new/metapost/bbcard/bbcard.mp 2016-11-25 19:32:51.000000000 +0100 @@ -0,0 +1,262 @@ + +% bullshit bingo card +% prepared by patrick tj mcphee, december 2002 ptjm(a)interlog.com +% released to the public domain. have fun + +% concept and many phrases taken from +% http://www.perkigoth.com/home/kermit/stuff/BullshitBingo +% others from the list of banished words of Lake Superior State University: +% http://www.lssu.edu/banished +% my thanks to all who have contributed to these efforts + +% to run off a single card, give a command like +% mpost bbcard +% and the card will written to bbcard.ps + +% to run off cards for several players, try +% mpost '\nocards := 7; input bbcard' +% and the cards will be written to bbcard.1, bbcard.2, .., bbcard.7 + +% to add additional phrases, duplicate one of the lines starting with +% i := i + 1; bs[i] := +% and replace the phrase in quotes +% I keep them in alphabetical order to ease maintenance, but you don't +% have to. I suggest commenting out phrases which are not known in +% your community and adding the irritating ones which are. + +input breakwidth; + +defaultfont := "ptmr8r"; + +prologues := 2; + +string bs[]; +i := 0; + +i := i + 1; bs[i] := "action item"; +i := i + 1; bs[i] := "actual facts"; +i := i + 1; bs[i] := "articulate"; +i := i + 1; bs[i] := "as we speak"; +i := i + 1; bs[i] := "at the end of the day"; +i := i + 1; bs[i] := "at this point in time"; +i := i + 1; bs[i] := "backward compatible"; +i := i + 1; bs[i] := "ballpark"; +i := i + 1; bs[i] := "bandwidth"; +i := i + 1; bs[i] := "basically"; +i := i + 1; bs[i] := "been there, done that"; +i := i + 1; bs[i] := "benchmark"; +i := i + 1; bs[i] := "best of breed"; +i := i + 1; bs[i] := "best practice"; +i := i + 1; bs[i] := "buzz"; +i := i + 1; bs[i] := "by and large"; +i := i + 1; bs[i] := "challenge"; +i := i + 1; bs[i] := "client-focused"; +i := i + 1; bs[i] := "collaborative"; +i := i + 1; bs[i] := "conceptualize"; +i := i + 1; bs[i] := "core business"; +i := i + 1; bs[i] := "core competency"; +i := i + 1; bs[i] := "critical path"; +i := i + 1; bs[i] := "down the road"; +i := i + 1; bs[i] := "down time"; +i := i + 1; bs[i] := "downsizing"; +i := i + 1; bs[i] := "drill down"; +i := i + 1; bs[i] := "dynamic"; +i := i + 1; bs[i] := "each and every"; +i := i + 1; bs[i] := "empower employees"; +i := i + 1; bs[i] := "extreme"; +i := i + 1; bs[i] := "fast-track"; +i := i + 1; bs[i] := "fault tolerant"; +i := i + 1; bs[i] := "front lines"; +i := i + 1; bs[i] := "game plan"; +i := i + 1; bs[i] := "gap analysis"; +i := i + 1; bs[i] := "go public"; +i := i + 1; bs[i] := "go the extra mile"; +i := i + 1; bs[i] := "going forward"; +i := i + 1; bs[i] := "hard-won lessons"; +i := i + 1; bs[i] := "hardball"; +i := i + 1; bs[i] := "having said that"; +i := i + 1; bs[i] := "heads up"; +i := i + 1; bs[i] := "issues"; +i := i + 1; bs[i] := "knock-on effect"; +i := i + 1; bs[i] := "knowledgebase"; +i := i + 1; bs[i] := "lessons learned"; +i := i + 1; bs[i] := "make no mistake"; +i := i + 1; bs[i] := "manage expectations"; +i := i + 1; bs[i] := "meaningful"; +i := i + 1; bs[i] := "metrics"; +i := i + 1; bs[i] := "mind share"; +i := i + 1; bs[i] := "mindset"; +i := i + 1; bs[i] := "mission critical"; +i := i + 1; bs[i] := "move the goal posts"; +i := i + 1; bs[i] := "movers and shakers"; +i := i + 1; bs[i] := "new economy"; +i := i + 1; bs[i] := "no blame"; +i := i + 1; bs[i] := "no-brainer"; +i := i + 1; bs[i] := "now, more than ever"; +i := i + 1; bs[i] := "off-site meeting"; +i := i + 1; bs[i] := "off-the-shelf"; +i := i + 1; bs[i] := "offload"; +i := i + 1; bs[i] := "on the same page"; +i := i + 1; bs[i] := "open source"; +i := i + 1; bs[i] := "out of the loop"; +i := i + 1; bs[i] := "out-source"; +i := i + 1; bs[i] := "outside the box"; +i := i + 1; bs[i] := "paradigm"; +i := i + 1; bs[i] := "partnership"; +i := i + 1; bs[i] := "proactive, not reactive"; +i := i + 1; bs[i] := "profitability"; +i := i + 1; bs[i] := "progressing"; +i := i + 1; bs[i] := "pushback"; +i := i + 1; bs[i] := "put this one to bed"; +i := i + 1; bs[i] := "results-driven"; +i := i + 1; bs[i] := "revenue"; +i := i + 1; bs[i] := "revisit"; +i := i + 1; bs[i] := "robust"; +i := i + 1; bs[i] := "run it up the flagpole"; +i := i + 1; bs[i] := "run the numbers"; +i := i + 1; bs[i] := "sales driven"; +i := i + 1; bs[i] := "scope"; +i := i + 1; bs[i] := "service oriented"; +i := i + 1; bs[i] := "slippery slide"; +i := i + 1; bs[i] := "speaks to"; +i := i + 1; bs[i] := "strategic fit"; +i := i + 1; bs[i] := "stretch the envelope"; +i := i + 1; bs[i] := "synergy"; +i := i + 1; bs[i] := "take that offline"; +i := i + 1; bs[i] := "target audience"; +i := i + 1; bs[i] := "team player"; +i := i + 1; bs[i] := "the big picture"; +i := i + 1; bs[i] := "the bottom line"; +i := i + 1; bs[i] := "think outside the box"; +i := i + 1; bs[i] := "ticks in boxes"; +i := i + 1; bs[i] := "time to market"; +i := i + 1; bs[i] := "timeline"; +i := i + 1; bs[i] := "to be perfectly honest"; +i := i + 1; bs[i] := "total quality"; +i := i + 1; bs[i] := "touch base"; +i := i + 1; bs[i] := "up to speed"; +i := i + 1; bs[i] := "user friendly"; +i := i + 1; bs[i] := "value-added"; +i := i + 1; bs[i] := "vast majority"; +i := i + 1; bs[i] := "very unique"; +i := i + 1; bs[i] := "walk the talk"; +i := i + 1; bs[i] := "web-enabled"; +i := i + 1; bs[i] := "win-win situation"; +i := i + 1; bs[i] := "wow factor"; + +bsmax := i; + +radius := .5 cm; + +offset := 1 cm; +boxwid := 1.9 cm; + + +% co-ordinates for the grid +pair bpos[], bpos[].ll, bpos[].ul, bpos[].ur, bpos[].lr; + for i = 0 upto 4: + for j = 0 upto 4: + bpos[i+j*5+1] := ((j+0.5)*boxwid, (i+0.5)*boxwid); + bpos[i+j*5+1].ll := (j*boxwid, i*boxwid); + bpos[i+j*5+1].ul := (j*boxwid, (i+1)*boxwid); + bpos[i+j*5+1].lr := ((j+1)*boxwid, i*boxwid); + bpos[i+j*5+1].ur := ((j+1)*boxwid, (i+1)*boxwid); + endfor; + endfor; + +picture bbcard[]; + +% the grid itself +bbcard[0] := image( + z1 = (0, radius) = z2 - (0, 5boxwid - 2radius) = + z6 - (5boxwid, 0) = z8 - (radius, -radius); + z3 = z8 + (0, 5boxwid) = z4 - (5boxwid-2radius, 0); + x5 = x6; y5 = y2; + x7 = x4; + y7 = y8; + + pickup pencircle xscaled 4pt yscaled 1pt rotated 30; + + draw z1---z2..z3---z4..z5---z6..z7---z8..cycle; + + fill ((unitsquare shifted -(.5,.5)) scaled boxwid) shifted bpos[13] withcolor .8 white; + + pickup pencircle scaled 1pt; + for i = 2 upto 5: + draw bpos[i].ll--bpos[i+20].lr; + endfor; + + for i = 10 step 5 until 25: + draw bpos[i].ul--bpos[i-4].ll; + endfor; +); + +% handle > 1 card if nocards was set on the command-line +if known nocards: + for bsno = 1 upto nocards: +else: + if unknown bsno: + bsno := -1; + fi; +fi; + + % select the strings for each card + % after we're done, we set the middle square to `Free Square' + % dups[] is used to keep track of already used values to eliminate + % duplicates within each grid (a playing card has four grids on it) + + for bb = 1 upto 4: + string bstring[]; + numeric dups[]; + + for i = 1 upto 25: + j := 1+floor(uniformdeviate bsmax); + + forever: + exitif unknown dups[j]; + j := 1+floor(uniformdeviate bsmax); + endfor; + dups[j] := i; + bstring[i] = bs[j]; + endfor; + + bstring[13] := "Free Square"; + + bbcard[bb] := image( + draw bbcard[0]; + for i = 1 upto 25: + label(breaktowidth(bstring[i], 1.5cm, 11pt), bpos[i]); + endfor; + ); + endfor; + + beginfig(bsno); + picture p; + p := ("Bullshit Bingo" infont defaultfont scaled 2) + shifted ((offset, 3offset)+2.25*ulcorner bbcard[0]); + + fill ((llcorner p)..(ulcorner p).. tension 2 .. (urcorner p).. + (lrcorner p) .. tension 2 .. cycle) + withcolor .5 white; + draw p withcolor white; + + draw ("Advanced Playing Card" infont defaultfont scaled 1.2) + shifted ((lrcorner p) + (10pt, 6pt)); + draw ("Stay awake!" infont defaultfont) + shifted ((lrcorner p) + (10pt, -14pt)); + draw ("Watch for duplicates!" infont defaultfont) + shifted ((lrcorner p) + (10pt, -25pt)); + draw ("Have fun!" infont defaultfont) + shifted ((lrcorner p) + (10pt, -36pt)); + + draw bbcard[1] shifted (offset, offset); + draw bbcard[2] shifted ((1.25offset, offset)+lrcorner bbcard[0]); + draw bbcard[3] shifted ((1.25offset, 2offset)+urcorner bbcard[0]); + draw bbcard[4] shifted ((offset, 2offset)+ulcorner bbcard[0]); + endfig; + +if known nocards: + endfor; +fi; + +end; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/bbcard/breakwidth.mp new/metapost/bbcard/breakwidth.mp --- old/metapost/bbcard/breakwidth.mp 1970-01-01 01:00:00.000000000 +0100 +++ new/metapost/bbcard/breakwidth.mp 2016-11-25 19:32:51.000000000 +0100 @@ -0,0 +1,101 @@ +%% +%% naive paragraph formatting for metapost. You get better results using +%% btex .. etex, since that will give you kerning, ligatures, and the +%% famous TeX paragraph breaking algorithm. This one is OK for me, though, +%% +%% Copyright 2001,2003 Patrick TJ McPhee +%% everyone is welcome to use this code for any purpose, to modify it, and +%% to copy it in whole or in part for use in other macro sets, with the +%% conditions that this copyright notice be preserved with any significant +%% portion of the code, and that modifications to this file be clearly +%% marked. + + +% arguments +% s - text to format +% w - maximum width +% b = baseline skip + +vardef breaktowidth(expr s, w, b) = + save p; + picture p; + + p := s infont defaultfont scaled defaultscale; + % if the string is too long to fit within bounds, we break it up on + % word boundaries. + if xpart(lrcorner p) > w: + save q, gq, offs, len, goodlen, gl, ls, sp; + + picture q, gq; + numeric offs, len, goodlen, ls, gl; + string sp; + + p := nullpicture; + offs := 0; % offset of current substring within s + len := 1; % most recent character examined + goodlen := 0; % most recent reasonable break point + ls := length(s); + + forever: + if len < ls: + sp := substring(len, len+1) of s; + else: + sp := " "; + fi; + + if (sp = " ") or (sp = "-") or (sp = "/"): + + if sp <>" ": + len := len + 1; + fi; + + % test to see if this is within the needed width + q := (substring(offs, len) of s) infont defaultfont scaled defaultscale; + + + if xpart (lrcorner q) > w: + % if there's no good break point, build up until we + % get something that fits -- can't use goodlen as the + % array index as it is reset to 0 after the loop ends + if goodlen <= offs: + for gl = (len-1) downto (offs+1): + goodlen := gl; + gq := (substring(offs, goodlen) of s) infont defaultfont scaled defaultscale; + exitunless xpart (lrcorner gq) > w; + endfor; + fi; + + + p := image(draw p shifted (0, b); + draw gq;); + offs := goodlen; + len := offs + 1; + + % we still fit, so save the current position + else: + if sp <> " ": + goodlen := len; + else: + goodlen := len+1; + fi; + gq := q; + fi; + fi; + + exitunless len < ls; + + len := len + 1; + endfor; + + if goodlen < ls: + gq := (substring(offs, ls) of s) infont defaultfont scaled defaultscale; + fi; + + if goodlen <> ls: + p := image(draw p shifted (0, b); + draw gq;); + fi; + fi; + p +enddef; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/bbcard/calendar.mp new/metapost/bbcard/calendar.mp --- old/metapost/bbcard/calendar.mp 1970-01-01 01:00:00.000000000 +0100 +++ new/metapost/bbcard/calendar.mp 2016-11-25 19:32:51.000000000 +0100 @@ -0,0 +1,216 @@ +%% One-page calendar +%% Patrick TJ McPhee, 1997 +%% you are permitted to modify or distribute this file +%% any way you like, but please indicate modifications +%% +%% Instructions: if you run this file through metafont, it will produce a +%% one-month calendar for next month, suitable for printing on US letter-size +%% paper. You can set two parameters, theyear affects the year for which the +%% calendar will be printed, and themonth affects the month. The valid +%% range for theyear is 1997 to some year well off in the future, and the +%% valid range for themonth is -1 to 12. If themonth is set to -1, calendars +%% will be printed for every month in the year. If themonth is set to 0, +%% a calendar will be printed for the following month. +%% The ouput file for each month is calendar.<themonth>. e.g., the +%% file for April would be calendar.4. + +%% fonts used to put up numbers, days of the week and holidays +string brandfont; +brandfont := "pplr8r"; +defaultfont:="pplr8r"; +defaultscale := 2; +prologues:=1; + +%% list of holidays. The first element of the array is the month, and the +%% second is the day of the month +string brands[][]; + +brands[12][25] := "Christmas"; +brands[1][1] = "Hogmany"; +brands[1][25] = "Robbie Burns"; +brands[2][14] = "Valentine"; +brands[11][11] = "Remembrance"; +brands[11][1] = "All Saints"; +brands[11][2] = "All Souls"; +brands[7][1] = "Canada Day"; + +%% days of the week +string weekdays[]; +weekdays[1] = "Sunday"; +weekdays[2] = "Monday"; +weekdays[3] = "Tuesday"; +weekdays[4] = "Wednesday"; +weekdays[5] = "Thursday"; +weekdays[6] = "Friday"; +weekdays[7] = "Saturday"; + +%% names of the months +string mnames[]; + +mnames[1] = "January"; +mnames[2] = "February"; +mnames[3] = "March"; +mnames[4] = "April"; +mnames[5] = "May"; +mnames[6] = "June"; +mnames[7] = "July"; +mnames[8] = "August"; +mnames[9] = "September"; +mnames[10] = "October"; +mnames[11] = "November"; +mnames[12] = "December"; + +%% I don't think anything needs to change below this point to support +%% other languages or other anticipated modifications + +% the same as `label', but specify the size +vardef alabel@#(expr s,z,sz) = % Position s near z size sz + save p; picture p; + if picture s: p=s + else: p = s infont brandfont scaled sz + fi; + p shifted (z + labeloffset*laboff@# - + (labxf@#*lrcorner p + labyf@#*ulcorner p + + (1-labxf@#-labyf@#)*llcorner p + ) + ) +enddef; + +def brand = draw alabel enddef; + +hoff:=.5in; +voff:= hoff; + +width:= 10in; +height := 7.5in; +margin := .05in; +daynameh := .5 in; + +daywidth := (width - 2margin)/7; +dayheight := (height - 2margin - daynameh)/5; + +picture frame; + + pickup pencircle scaled 2 pt yscaled .6 pt rotated 135; +% pickup penrazor scaled 2 pt rotated 135; + bot y1 = voff = bot y8 = top y4 - height = top y5 - height; + lft x2 = hoff = lft x3 = rt x6 - width = rt x7 - width; + x1 - x4 = 0 = y2 - y7 = y3 - y6 = x5 - x8; + x1 - x2 = hoff = y2 - y1 = y4 - y3 = x7 - x8; + +% draw z1..z2---z3..z4---z5..z6---z7..z8---cycle; + draw (x3-.25hoff,y4+.25voff){dir(-45)}..z4---z5..z6---z7..{dir(-45)}(x7+.25hoff, .75voff) + {dir(135)}..z8---z1..z2---z3..{dir(135)}cycle; + + + pickup pencircle scaled .6 pt; + z1 - z9 = (margin, -margin) = z6 - z14 = z10 - z2 = z13 - z5; + z3 - z11 = (-margin, -margin) = z8 - z16 = z12 - z4 = z15 - z7; + + draw z9..z10---z11..z12---z13..z14---z15..z16---cycle; + + for i := 1 upto 6: + draw (x10+i*daywidth, y9)--(x10+i*daywidth, y12); + endfor; + + for i := 1 upto 5: + draw (x10, y9+i*dayheight)--(x15, y9+i*dayheight); + endfor; + + for i := 1 upto 7: + label(weekdays[i], (x10+(i-.5)*daywidth, y9+5daywidth+.2 daynameh)); + endfor; + +lftedge := x10; +rtedge := x15; +botedge := y9; + +frame := currentpicture; + +clearit; + +mdays[1] = 31; +mdays[2] = 28; +mdays[3] = 31; +mdays[4] = 30; +mdays[5] = 31; +mdays[6] = 30; +mdays[7] = 31; +mdays[8] = 31; +mdays[9] = 30; +mdays[10] = 31; +mdays[11] = 30; +mdays[12] = 31; + +def drawmonth (expr mon, startday) := +beginfig(mon); + draw frame; + + numhoff := lftedge + startday*daywidth; + numvoff := botedge + 5 * dayheight; + + if startday > 1: + undraw (lftedge+daywidth, numvoff-.25 dayheight)..(lftedge+daywidth, numvoff-.75 dayheight); + brand (mnames[mon], (lftedge+daywidth,numvoff-.5 dayheight), 3); + brand (decimal theyear, (lftedge+daywidth,numvoff-.7 dayheight), 1); + fi; + + for i := 1 upto mdays[mon]: + if numvoff > botedge: + label.lrt(decimal i, (numhoff, numvoff)); + else: + label.ulft(decimal i, (numhoff+daywidth, numvoff)); + fi; + numhoff := numhoff + daywidth; + + if known brands[mon][i]: brand.llft(brands[mon][i], (numhoff,numvoff), 1); fi + + if numhoff >= rtedge: + numhoff := lftedge; + numvoff := numvoff - dayheight; + fi + endfor; + + if startday <= 1: + undraw (lftedge+6daywidth, numvoff-.25 dayheight)..(lftedge+6daywidth, numvoff-.75 dayheight); + brand (mnames[mon], (lftedge+6daywidth,numvoff-.5 dayheight), 3); + brand (decimal theyear, (lftedge+6daywidth,numvoff-.7 dayheight), 1); + fi; + + currentpicture := currentpicture rotatedaround((4.25in,4.25in),90); +endfig; +enddef; + +%% if no year is specified, try for the current year +if unknown theyear: theyear:=year; +elseif theyear=0: theyear:=year; +fi; +firstday := (3 + (theyear - 1997) + (theyear - 1997) div 4) mod 7; + +%% if no month is specified, try for next month +if unknown themonth: themonth := month + 1; +elseif themonth=0: themonth := month + 1; +fi; +if themonth = 13: + theyear := theyear+1; + themonth := 1; + fi; + +if ((theyear mod 4) = 0) + and (((theyear mod 100) <> 0) or ((theyear mod 400) = 0)): + mdays[2] := 29; + fi; + +% special value of themonth: -1 prints the whole year's calendar +if themonth = -1: + for j = 1 upto 12: + drawmonth(j, firstday); + firstday := (firstday + mdays[j]) mod 7; + endfor; +else: + for j = 1 upto (themonth-1): + firstday := (firstday + mdays[j]) mod 7; + endfor; + drawmonth(themonth, firstday); +fi +end; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/bbcard/scorecard.mp new/metapost/bbcard/scorecard.mp --- old/metapost/bbcard/scorecard.mp 1970-01-01 01:00:00.000000000 +0100 +++ new/metapost/bbcard/scorecard.mp 2016-11-25 19:32:51.000000000 +0100 @@ -0,0 +1,152 @@ +% +% Ball score card + +defaultfont:="rptmr"; +defaultscale := 1; +prologues := 1; +special "/rptmr /Times-Roman def"; + +% pen for the outer box +pickup pencircle scaled 1 pt; +fat nib = savepen; + +% pen for the cross-lines +pickup pencircle scaled .5 pt; +medium nib = savepen; + +% pen for slashes +pickup pencircle scaled .1 pt; +thin nib = savepen; + +un = 1 cm; + +def urc (expr x,y) = + ((x,y)-(.2un,0)){right}..{down}((x,y)-(0,.2un)) +enddef; +def lrc (expr x, y) = + ((x,y)+(0,.2un)){down}..{left}((x,y)-(.2un,0)) +enddef; +def llc (expr x, y) = + ((x,y)+(.2un,0)){left}..{up}((x,y)+(0,.2un)) +enddef; +def ulc (expr x, y) = + ((x,y)-(0,.2un)){up}..{right}((x,y)+(.2un,0)) +enddef; + + +beginfig(-1); + + picture pitcherbox, batterbox; + + batterbox = image ( + % outer frame + pickup fat nib; + draw llc (0,0)---ulc (0,11un)---urc(20un,11un)---lrc (20un,0)---cycle; + + % and some frame-like lines + draw (0,1un)---(20un,1un); + draw (0,10un)---(20un,10un); + draw (4un,0)---(4un,11un); + + % name separators + pickup medium nib; + for i = 2un step un until 9 un: + draw (0,i)---(20un,i); + endfor; + + for i := 5 un step un until 19 un: + draw (i, 0)---(i, 11un); + endfor; +% added by Dave Rebnord + for i := 4 un step un until 14 un: + for j := 1 un step un until 9 un : + draw (i+0.2un,j+0.5un)---(i+0.5un, j+0.8un)---(i+0.8un,j+0.5un)---(i+0.5un,j+0.2un)---cycle withcolor .25[white, black]; + endfor; + endfor; + + % slashes and other light lines + pickup thin nib; + for i := 4un step un until 15un: + draw (i,0)---(i+un, un); + endfor; + + for i := un step un until 9un: + draw (0, i+.5un)---(4un, i+.5un); + draw (15un, i)---(16un, i+un); + draw (19un, i)---(20un, i+un); + endfor; + + + draw (15un, 0)---(16un, un); + draw (19un, 0)---(20un, un); + draw (15un, 10un)---(16un, 11un); + draw (19un, 10un)---point .5 of (urc (20un,11un)); + + + % labels + for i := 1 upto 11: + label(decimal i, ((3.5+i)*un, 10.5un)); + endfor; + + label.rt("Totals", (0, .5un)); + + label.lft("Runs", (4un, 2/3un)); + label.lft("Hits", (4un, 1/3un)); + + + label.bot("ab", (15.3un, 11un)); + label.top("ap", (15.7un, 10un)); + + label("r", (16.5un, 10.5un)); + label("h", (17.5un, 10.5un)); + label("rbi", (18.5un, 10.5un)); + + label.bot("ob", (19.3un, 11un)); + label.top("e", (19.7un, 10un)); + ); + + + pitcherbox = image ( + % outer frame + pickup fat nib; + ph = 4.5un/5; + draw llc (0,0)---ulc (0, 5ph)---urc (20un,5ph)---lrc (20un,0)---cycle; + + % and some frame-like lines + draw urc (10un,5ph)---lrc (10un, 4ph)---llc (0,4ph); + + draw urc (10un, 4ph)---(10un,0); + draw (4un,0)..(4un,5ph); + + % name separators + pickup medium nib; + + draw ulc (10un, 4ph)---(20un,4ph); + draw llc (10un, 4ph); + + for i = ph step ph until 3ph: + draw (0,i)---(20un,i); + endfor; + + for i := 0 step un until 4un: + draw (5un+i,0)---(5un+i, 5ph); + draw (14un+i,0)---(14un+i, 5ph); + endfor; + draw (19un,0)---(19un, 5ph); + + label("Pitchers", (2un, 4.5ph)); + label("IP", (4.5un, 4.5ph)); + label("H", (5.5un, 4.5ph)); + label("R", (6.5un, 4.5ph)); + label("ER", (7.5un, 4.5ph)); + label("K", (8.5un, 4.5ph)); + label("BB", (9.5un, 4.5ph)); + ); + + + draw batterbox shifted (.75un, .75un); + draw pitcherbox shifted (.75un, 11.85un); + draw batterbox shifted (.75un, 16.45un); + +endfig; +end; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bbcard.tlpobj new/tlpkg/tlpobj/bbcard.tlpobj --- old/tlpkg/tlpobj/bbcard.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/bbcard.tlpobj 2017-04-14 17:29:51.000000000 +0200 @@ -0,0 +1,16 @@ +name bbcard +category Package +revision 19440 +shortdesc Bullshit bingo, calendar and baseball-score cards +relocated 1 +longdesc Three jiffy packages for creating cards of various sorts with +longdesc MetaPost. +runfiles size=6 + RELOC/metapost/bbcard/bbcard.mp + RELOC/metapost/bbcard/breakwidth.mp + RELOC/metapost/bbcard/calendar.mp + RELOC/metapost/bbcard/scorecard.mp +catalogue-ctan /graphics/metapost/contrib/macros/bbcard +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license pd +catalogue-topics games calendar card-gen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bitpattern.doc.tlpobj new/tlpkg/tlpobj/bitpattern.doc.tlpobj --- old/tlpkg/tlpobj/bitpattern.doc.tlpobj 2016-04-14 18:47:30.000000000 +0200 +++ new/tlpkg/tlpobj/bitpattern.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name bitpattern.doc -category Package -revision 39073 -shortdesc doc files of bitpattern -relocated 1 -docfiles size=44 - RELOC/doc/latex/bitpattern/README.md - RELOC/doc/latex/bitpattern/bitpattern.pdf ++++++ bold-extra.doc.tar.xz -> bbold.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bbold/INSTALL new/doc/latex/bbold/INSTALL --- old/doc/latex/bbold/INSTALL 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bbold/INSTALL 2016-11-25 19:28:09.000000000 +0100 @@ -0,0 +1,40 @@ +THE BBOLD SYMBOL FONT + +6 APRIL 1994 + +This distribution contains the bbold symbol font: + + INSTALL bbgreeku.mf bbold.dtx bbold17.mf bbold8.mf + README bbligs.mf bbold.mf bbold5.mf bbold9.mf + bbbase.mf bblower.mf bbold10.mf bbold6.mf bbparams.mf + bbgreekl.mf bbnum.mf bbold12.mf bbold7.mf bbpunc.mf + bbupper.mf + +To install the fonts, you should: + + * run METAFONT on the fonts, for example under Unix you say: + + mf "\mode=localfont; input bbold5;" + mf "\mode=localfont; input bbold6;" + mf "\mode=localfont; input bbold7;" + mf "\mode=localfont; input bbold8;" + mf "\mode=localfont; input bbold9;" + mf "\mode=localfont; input bbold12;" + mf "\mode=localfont; input bbold17;" + + * move bbold*.tfm into a TeX font metrics directory + + * move bbold*.*pk into a TeX bitmaps directory + +If you want to use the bbold font in LaTeX2e, you should: + + * run LaTeX2e on bbold.dtx + + * move bbold.sty and Ubbold.fd into a TeX inputs directory + + * read the documentation in bbold.dvi + +This file should only be distributed as part of the bbold +distribution. + +Copyright 1994 Alan Jeffrey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bbold/README new/doc/latex/bbold/README --- old/doc/latex/bbold/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bbold/README 2016-11-25 19:28:09.000000000 +0100 @@ -0,0 +1,12 @@ +THE BBOLD SYMBOL FONT + +6 APRIL 1994 + +This directory contains the bbold symbol font. This is a geometric +sans serif blackboard bold font, for use in mathematics. + +Read the INSTALL file for details of how to install the bbold +package. + +Alan Jeffrey (alanje(a)cogs.susx.ac.uk) + Binary files old/doc/latex/bbold/bbold.pdf and new/doc/latex/bbold/bbold.pdf differ Binary files old/doc/latex/bold-extra/bold-extra.pdf and new/doc/latex/bold-extra/bold-extra.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bold-extra/bold-extra.tex new/doc/latex/bold-extra/bold-extra.tex --- old/doc/latex/bold-extra/bold-extra.tex 2010-02-17 20:36:21.000000000 +0100 +++ new/doc/latex/bold-extra/bold-extra.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -\documentclass[DIV=9, pagesize=auto, version=last]{scrartcl} - -\usepackage{lmodern} -\usepackage{mflogo} -\usepackage[T1]{fontenc} -\usepackage{microtype} -\usepackage{hyperref} - -\addtokomafont{title}{\rmfamily} - -\title{The \textsf{bold-extra} package} -\subtitle{A jiffy to provide access (in \LaTeX) to (some of) the fonts\\ in CTAN directory \texttt{fonts/cm/mf-extra/bold}} -\author{Robin Fairbairns, \href{mailto:rf10@cam.ac.uk}{\texttt{rf10@cam.ac.uk}}} -\date{November 2001} - - -\begin{document} - -\maketitle - -\noindent -This package is provided under the provisions of the \LaTeX\ Project -Public Licence, \url{http://www.latex-project.org/lppl.txt} - -This packages provides font shapes to support bold small caps and TT -text. There is a choice of bold TT fonts, which are selected by -package options \texttt{cmbtt} and \texttt{cmttb} (this reflects the confusingly -similar font names). The default (based on the author's estimation -of the fonts' relative merits) is \texttt{cmttb}. - -To use these fonts you need their \MF\ sources available to your -\TeX\ system (as far as I know, there are no Type~1 versions of the -fonts available yet). Place them in an appropriate place under -\texttt{fonts/source} in your TDS \textsf{texmf} tree; place this file somewhere like -\texttt{tex/latex/misc} in your tree. See -\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages+wherefiles} -for more details. - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bbold.doc.tlpobj new/tlpkg/tlpobj/bbold.doc.tlpobj --- old/tlpkg/tlpobj/bbold.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/bbold.doc.tlpobj 2017-04-14 17:29:52.000000000 +0200 @@ -0,0 +1,9 @@ +name bbold.doc +category Package +revision 17187 +shortdesc doc files of bbold +relocated 1 +docfiles size=41 + RELOC/doc/latex/bbold/INSTALL + RELOC/doc/latex/bbold/README + RELOC/doc/latex/bbold/bbold.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bold-extra.doc.tlpobj new/tlpkg/tlpobj/bold-extra.doc.tlpobj --- old/tlpkg/tlpobj/bold-extra.doc.tlpobj 2016-04-14 18:47:38.000000000 +0200 +++ new/tlpkg/tlpobj/bold-extra.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name bold-extra.doc -category Package -revision 17076 -shortdesc doc files of bold-extra -relocated 1 -docfiles size=56 - RELOC/doc/latex/bold-extra/bold-extra.pdf - RELOC/doc/latex/bold-extra/bold-extra.tex ++++++ bold-extra.doc.tar.xz -> bbold.tar.xz ++++++ ++++ 4565 lines of diff (skipped) ++++++ bbold_bbold11.dif ++++++ --- texmf-dist/fonts/source/public/bbold/bbold11.mf +++ texmf-dist/fonts/source/public/bbold/bbold11.mf 2010-01-14 08:18:19.579429546 +0000 @@ -0,0 +1,19 @@ +% Blackboard bold 11pt. + +mode_setup; + +input bbbase; + +% Hacks to make sure cmr doesn't generate the font, and doesn't load cmbase. +cmbase := 1; +def generate suffix t = enddef; + +% Input the cmr parameters. +input cmr11; + +font_identifier := "BBOLD"; +font_coding_scheme := "Blackboard bold"; + +% Then generate blackboard bold. +input bbold; +bye; ++++++ beamer-tut-pt.doc.tar.xz ++++++ ++++++ beamer-verona.doc.tar.xz ++++++ ++++++ beamer-verona.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamer-verona.tlpobj new/tlpkg/tlpobj/beamer-verona.tlpobj --- old/tlpkg/tlpobj/beamer-verona.tlpobj 2016-04-14 18:38:43.000000000 +0200 +++ new/tlpkg/tlpobj/beamer-verona.tlpobj 2017-04-14 17:29:56.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/beamer-verona/beamerthemeVerona.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamer-verona -catalogue-date 2016-01-04 06:20:16 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation catalogue-version 0.2 ++++++ bnumexpr.doc.tar.xz -> beamer.doc.tar.xz ++++++ ++++ 15327 lines of diff (skipped) ++++++ bnumexpr.tar.xz -> beamer.tar.xz ++++++ ++++ 24444 lines of diff (skipped) ++++++ beamer2thesis.doc.tar.xz ++++++ ++++++ beamer2thesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamer2thesis.tlpobj new/tlpkg/tlpobj/beamer2thesis.tlpobj --- old/tlpkg/tlpobj/beamer2thesis.tlpobj 2016-04-14 18:38:43.000000000 +0200 +++ new/tlpkg/tlpobj/beamer2thesis.tlpobj 2017-04-14 17:29:56.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty RELOC/tex/latex/beamer2thesis/logopolito.jpg catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamer2thesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation presentation catalogue-version 2.2 ++++++ beameraudience.doc.tar.xz ++++++ ++++++ beameraudience.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beameraudience.tlpobj new/tlpkg/tlpobj/beameraudience.tlpobj --- old/tlpkg/tlpobj/beameraudience.tlpobj 2016-04-14 18:38:43.000000000 +0200 +++ new/tlpkg/tlpobj/beameraudience.tlpobj 2017-04-14 17:29:56.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/beameraudience/beameraudience.sty catalogue-also beamer catalogue-ctan /macros/latex/contrib/beamer-contrib/beameraudience -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 0.1 ++++++ beamercolorthemeowl.doc.tar.xz ++++++ ++++++ beamercolorthemeowl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamercolorthemeowl.tlpobj new/tlpkg/tlpobj/beamercolorthemeowl.tlpobj --- old/tlpkg/tlpobj/beamercolorthemeowl.tlpobj 2016-04-14 18:38:44.000000000 +0200 +++ new/tlpkg/tlpobj/beamercolorthemeowl.tlpobj 2017-04-14 17:29:56.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=2 RELOC/tex/latex/beamercolorthemeowl/beamercolorthemeowl.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamercolorthemeowl -catalogue-date 2016-03-21 05:56:19 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation catalogue-version 0.1.1 ++++++ beamerdarkthemes.doc.tar.xz ++++++ ++++++ beamerdarkthemes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerdarkthemes.tlpobj new/tlpkg/tlpobj/beamerdarkthemes.tlpobj --- old/tlpkg/tlpobj/beamerdarkthemes.tlpobj 2016-04-14 18:38:47.000000000 +0200 +++ new/tlpkg/tlpobj/beamerdarkthemes.tlpobj 2017-04-14 17:29:57.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/beamerdarkthemes/beamercolorthemefrigatebird.sty RELOC/tex/latex/beamerdarkthemes/beamercolorthememagpie.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation catalogue-version 0.4.1 ++++++ beamerposter.doc.tar.xz ++++++ ++++++ beamerposter.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerposter.tlpobj new/tlpkg/tlpobj/beamerposter.tlpobj --- old/tlpkg/tlpobj/beamerposter.tlpobj 2016-04-14 18:38:47.000000000 +0200 +++ new/tlpkg/tlpobj/beamerposter.tlpobj 2017-04-14 17:29:58.000000000 +0200 @@ -18,7 +18,7 @@ runfiles size=4 RELOC/tex/latex/beamerposter/beamerposter.sty catalogue-ctan /macros/latex/contrib/beamerposter -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics poster presentation catalogue-version 1.12 ++++++ beamersubframe.doc.tar.xz ++++++ ++++++ beamersubframe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamersubframe.tlpobj new/tlpkg/tlpobj/beamersubframe.tlpobj --- old/tlpkg/tlpobj/beamersubframe.tlpobj 2016-04-14 18:38:48.000000000 +0200 +++ new/tlpkg/tlpobj/beamersubframe.tlpobj 2017-04-14 17:29:58.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/beamersubframe/beamersubframe.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/beamersubframe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 0.2 ++++++ beamertheme-detlevcm.doc.tar.xz ++++++ ++++++ beamertheme-detlevcm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-detlevcm.tlpobj new/tlpkg/tlpobj/beamertheme-detlevcm.tlpobj --- old/tlpkg/tlpobj/beamertheme-detlevcm.tlpobj 2016-04-14 18:38:49.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-detlevcm.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/beamertheme-detlevcm/beamerouterthemeDetlevCM.sty RELOC/tex/latex/beamertheme-detlevcm/beamerthemeDetlevCM.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/detlevcm -catalogue-date 2015-12-10 14:44:42 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics presentation catalogue-version 1.02 ++++++ beamertheme-epyt.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-epyt/README new/doc/latex/beamertheme-epyt/README --- old/doc/latex/beamertheme-epyt/README 2016-05-16 00:09:34.000000000 +0200 +++ new/doc/latex/beamertheme-epyt/README 2016-11-25 19:28:11.000000000 +0100 @@ -1,11 +1,8 @@ -Package epyt: a simple and clean theme for LaTeX beamer class -Copyright (C) 2013-2015 Zou Hu <zohooo(a)yeah.net> - +Package epyt: a simple and clean theme for LaTeX beamer class. Please report bugs, problems, and suggestions via + https://github.com/zohooo/epyt The package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this -license or (at your option) any later version. The latest version -of this license is in - http://www.latex-project.org/lppl.txt +license or (at your option) any later version. Binary files old/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf and new/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-epyt/epyt-demo-cn.tex new/doc/latex/beamertheme-epyt/epyt-demo-cn.tex --- old/doc/latex/beamertheme-epyt/epyt-demo-cn.tex 2016-05-16 00:09:34.000000000 +0200 +++ new/doc/latex/beamertheme-epyt/epyt-demo-cn.tex 2016-11-25 19:28:11.000000000 +0100 @@ -1,26 +1,22 @@ % -*- coding: utf-8 -*- % !TEX program = xelatex -\documentclass[14pt,notheorems,xcolor={rgb}]{beamer} +\documentclass[14pt,notheorems]{beamer} \usetheme[style=beta]{epyt} % alpha, beta, delta, gamma, zeta -\usepackage{arev} % use arev sans font - \usepackage[UTF8,noindent]{ctex} -\setlength{\parskip}{5pt plus 1pt minus 1pt} - \usepackage{listings} \lstset{ basicstyle=\ttfamily,xleftmargin=0em, - commentstyle=\color{teal},keywordstyle=\color{accent4}, + commentstyle=\color{teal},keywordstyle=\color{acolor4}, language=[LaTeX]{TeX},morekeywords={usetheme,epytsetup} } -\newcommand{\mylead}[1]{\textcolor{accent1}{#1}} -\newcommand{\mybold}[1]{\textcolor{accent2}{#1}} -\newcommand{\mywarn}[1]{\textcolor{accent3}{#1}} +\newcommand{\mylead}[1]{\textcolor{acolor1}{#1}} +\newcommand{\mybold}[1]{\textcolor{acolor2}{#1}} +\newcommand{\mywarn}[1]{\textcolor{acolor3}{#1}} \newtheorem{theorem}{定理} \newtheorem{definition}[theorem]{定义} @@ -61,25 +57,22 @@ \begin{frame}{下载安装} \mylead{Epyt} 主题已经包含在主要的 TeX 发行版中。 \begin{itemize} - \item 在 MiKTeX 中作为 \mybold{beamer-theme-epyt} 宏包。 - \item 在 TeXLive 中作为 \mybold{epyt} 宏包。 + \item 在 MiKTeX 中作为 \mybold{beamertheme-epyt} 宏包。 + \item 在 TeXLive 中作为 \mybold{beamertheme-epyt} 宏包。 \end{itemize} 你可以在包管理器中安装它。当然也可以直接从 -\href{https://www.ctan.org/pkg/epyt}{CTAN} 中下载并安装。 +\href{https://www.ctan.org/pkg/beamertheme-epyt}{CTAN} 中下载并安装。 \end{frame} \begin{frame}[fragile]{开始使用} -下面的代码是使用 \mylead{epyt} 主题的最简单例子。 +要使用 \mylead{epyt} 主题，可以在导言区中加入下面一行。 \begin{lstlisting} -\documentclass[xcolor={rgb}]{beamer} \usetheme{epyt} \end{lstlisting}\pause 如果要使用中文，可以添加 \verb ctex 宏包，例如： \begin{lstlisting} -\usepacakge[UTF8,noindent]{ctex} -\end{lstlisting}\pause -注意你\mywarn{必须}给 xcolor 宏包传递 rgb 参数。 -这是因为 epyt 主题总是使用 HSB 颜色模型。 +\usepackage[UTF8,noindent]{ctex} +\end{lstlisting} \end{frame} \begin{frame}[fragile]{样式选用} @@ -109,50 +102,23 @@ \begin{frame}{预定义的颜色} 每种样式都预先定义了五种强调颜色。当前样式的强调颜色如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} \pause 每种样式也预先定义了五种填充颜色，如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \pause 用 tikz 绘图时可以使用这些预先定义的颜色。 \end{frame} -\epytsetup{style=zeta} - -\begin{frame}[plain]\transboxout -\titlepage -\end{frame} - -\section{白色文字红色背景} - -\begin{frame}{预定义的颜色} -当前样式预先定义了五种强调颜色，如下所示。 -\begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -当前样式预先定义了五种填充颜色，如下所示。 -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} -\end{flushleft} -\end{frame} - \epytsetup{style=gamma} \begin{frame}[plain]\transboxout @@ -164,19 +130,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色，如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色，如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -201,19 +167,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色，如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色，如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -228,19 +194,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色，如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色，如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -255,4 +221,31 @@ \end{proof} \end{frame} +\epytsetup{style=zeta} + +\begin{frame}[plain]\transboxout +\titlepage +\end{frame} + +\section{白色文字红色背景} + +\begin{frame}{预定义的颜色} +当前样式预先定义了五种强调颜色，如下所示。 +\begin{flushleft} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +当前样式预先定义了五种填充颜色，如下所示。 +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} +\end{flushleft} +\end{frame} + \end{document} Binary files old/doc/latex/beamertheme-epyt/epyt-demo.pdf and new/doc/latex/beamertheme-epyt/epyt-demo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-epyt/epyt-demo.tex new/doc/latex/beamertheme-epyt/epyt-demo.tex --- old/doc/latex/beamertheme-epyt/epyt-demo.tex 2016-05-16 00:09:34.000000000 +0200 +++ new/doc/latex/beamertheme-epyt/epyt-demo.tex 2016-11-25 19:28:11.000000000 +0100 @@ -1,23 +1,19 @@ % -*- coding: utf-8 -*- % !TEX program = xelatex -\documentclass[12pt,xcolor={rgb}]{beamer} +\documentclass[12pt]{beamer} \usetheme[style=beta]{epyt} % alpha, beta, delta, gamma, zeta -\usepackage{arev} % use arev sans font - -\setlength{\parskip}{5pt plus 1pt minus 1pt} - \usepackage{listings} \lstset{ basicstyle=\ttfamily,xleftmargin=2em, - commentstyle=\color{teal},keywordstyle=\color{accent4}, + commentstyle=\color{teal},keywordstyle=\color{acolor4}, language=[LaTeX]{TeX},morekeywords={usetheme,epytsetup} } -\newcommand{\mylead}[1]{\textcolor{accent1}{#1}} -\newcommand{\mybold}[1]{\textcolor{accent2}{#1}} -\newcommand{\mywarn}[1]{\textcolor{accent3}{#1}} +\newcommand{\mylead}[1]{\textcolor{acolor1}{#1}} +\newcommand{\mybold}[1]{\textcolor{acolor2}{#1}} +\newcommand{\mywarn}[1]{\textcolor{acolor3}{#1}} \begin{document} @@ -50,17 +46,17 @@ \begin{frame}{Getting the Theme} \mylead{Epyt} theme is contained in major TeX distributions. \begin{itemize} - \item In MiKTeX as \mybold{beamer-theme-epyt} package. - \item In TeXLive as \mybold{epyt} package. + \item In MiKTeX as \mybold{beamertheme-epyt} package. + \item In TeXLive as \mybold{beamertheme-epyt} package. \end{itemize} You could install \mylead{epyt} in the package manager.\par\pause -Also you could download \mylead{epyt} from \href{https://www.ctan.org/pkg/epyt}{CTAN}. +Also you could download \mylead{epyt} from \href{https://www.ctan.org/pkg/beamertheme-epyt}{CTAN}. \end{frame} \begin{frame}[fragile]{Getting Started} The following code is a minimal example using \mylead{epyt} theme. \begin{lstlisting} -\documentclass[xcolor={rgb}]{beamer} +\documentclass{beamer} \usetheme{epyt} \begin{document} \begin{frame}{Hello} @@ -68,9 +64,6 @@ \end{frame} \end{document} \end{lstlisting} -\pause -Note that you \mywarn{should} pass rgb option to xcolor package, -since epyt theme always uses HSB colors. \end{frame} \begin{frame}[fragile]{Customization} @@ -101,19 +94,19 @@ For each style, five accent colors are predefined. With current style, they are the followings. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -\pause Also five filler colors are predefined for each style. -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +\pause Also five filling colors are predefined for each style. +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \pause These colors are useful when you are drawing a tikz picture. \end{frame} @@ -129,19 +122,19 @@ \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -Also five filler colors are predefined for this style. -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +Also five filling colors are predefined for this style. +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -166,19 +159,19 @@ \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -Also five filler colors are predefined for this style. -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +Also five filling colors are predefined for this style. +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -205,19 +198,19 @@ \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -Also five filler colors are predefined for this style. -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +Also five filling colors are predefined for this style. +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -232,19 +225,19 @@ \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -Also five filler colors are predefined for this style. -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +Also five filling colors are predefined for this style. +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-epyt.doc.tlpobj new/tlpkg/tlpobj/beamertheme-epyt.doc.tlpobj --- old/tlpkg/tlpobj/beamertheme-epyt.doc.tlpobj 2016-05-16 00:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-epyt.doc.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -1,9 +1,9 @@ name beamertheme-epyt.doc category Package -revision 41159 +revision 41404 shortdesc doc files of beamertheme-epyt relocated 1 -docfiles size=57 +docfiles size=85 RELOC/doc/latex/beamertheme-epyt/README RELOC/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf RELOC/doc/latex/beamertheme-epyt/epyt-demo-cn.tex ++++++ beamertheme-epyt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-epyt/beamerthemeepyt.sty new/tex/latex/beamertheme-epyt/beamerthemeepyt.sty --- old/tex/latex/beamertheme-epyt/beamerthemeepyt.sty 2016-05-16 00:09:34.000000000 +0200 +++ new/tex/latex/beamertheme-epyt/beamerthemeepyt.sty 2016-11-25 19:33:41.000000000 +0100 @@ -1,12 +1,9 @@ % -*- coding: utf-8 -*- -\ProvidesPackage{beamerthemeepyt}[2016/05/14 v0.8] +\ProvidesPackage{beamerthemeepyt}[2016/05/25 v1.0] \makeatletter -\RequirePackage{tikz} -\usetikzlibrary{patterns} - %%% presentation mode \mode<presentation> @@ -17,6 +14,8 @@ %% basic settings +\setlength{\parskip}{5pt plus 1pt minus 1pt} + \setbeamersize{text margin left=8mm,text margin right=8mm} %\geometry{hmargin=1em,vmargin=0em} @@ -42,30 +41,16 @@ \pgfuseshading{epyt@backgroundshading}% } -\defbeamertemplate{background}{brick} -{% - \usebeamercolor{normal text}% - \begin{tikzpicture} - \draw[pattern=bricks, pattern color=normal text.bg!80!black] - (0,0) rectangle (\paperwidth-\pgflinewidth,\paperheight-\pgflinewidth); - \end{tikzpicture} -} -\defbeamertemplate{background}{line} -{% - \usebeamercolor{normal text}% - \begin{tikzpicture} - \draw[pattern=horizontal lines, pattern color=normal text.bg!90!normal text.fg] - (0,0) rectangle (\paperwidth,\paperheight); - \end{tikzpicture} -} - \defbeamertemplate{frametitle}{simple} {% - \noindent\usebeamerfont{frametitle}\insertframetitle\par + \begingroup\offinterlineskip + \begin{beamercolorbox}[wd=\paperwidth,leftskip=\beamer@leftmargin]{frametitle} + \vskip6pt + \noindent\usebeamerfont{frametitle}\strut\insertframetitle\strut\par + \vskip4pt + \end{beamercolorbox} + \endgroup } -\setbeamertemplate{frametitle}[simple] - -\setbeamertemplate{navigation symbols}{} \defbeamertemplate{footline}{simple} { @@ -84,53 +69,28 @@ \end{beamercolorbox}% }% } -\defbeamertemplate{footline}{sectioning} -{ - \hbox{% - \begin{beamercolorbox}[wd=.8\paperwidth,ht=2.25ex,dp=1ex,left]{footline}% - \usebeamerfont{footline}\hspace*{\beamer@leftmargin}\insertshorttitle - \ifx\insertsection\@empty\else\qquad$\vartriangleright$\qquad\insertsection\fi - \ifx\insertsubsection\@empty\else\qquad$\vartriangleright$\qquad\insertsubsection\fi - \end{beamercolorbox}% - \begin{beamercolorbox}[wd=.2\paperwidth,ht=2.25ex,dp=1ex,right]{footline}% - \usebeamerfont{footline}% - \hyperlinkframeendprev{$\vartriangle$} - \Acrobatmenu{GoToPage}{\insertframenumber{}/\inserttotalframenumber} - \hyperlinkframestartnext{$\triangledown$}\hspace*{\beamer@rightmargin} - \end{beamercolorbox}% - }% -} -\setbeamertemplate{footline}[simple] %% -------------------- inner template -------------------- -\defbeamertemplate{title page}{simple}[1][]{ - \begin{beamercolorbox}[#1]{title} - \usebeamerfont{title}\inserttitle - \end{beamercolorbox} - \ifx\insertsubtitle\@empty\else - \vskip0.7em - \begin{beamercolorbox}[#1]{subtitle} - \usebeamerfont{subtitle}\insertsubtitle - \end{beamercolorbox} - \fi% - \vskip2em{\color{text1!50!back1}\hrule}\vskip2em - \begin{beamercolorbox}[#1]{author} - \usebeamerfont{author}\insertauthor - \end{beamercolorbox} - \ifx\insertinstitute\@empty\else - \vskip0.7em - \begin{beamercolorbox}[#1]{institute} - \usebeamerfont{institute}\insertinstitute - \end{beamercolorbox} - \fi% - \vskip2em{\color{text1!50!back1}\hrule}\vskip2em - \begin{beamercolorbox}[#1]{date} - \usebeamerfont{date}\insertdate - \end{beamercolorbox} +\defbeamertemplate{title separator one}{simple}{% + \hbox to \hsize{\hrulefill}% +} +\defbeamertemplate{title separator one}{triangle}{ + \hbox to \hsize{% + \tiny\leaders\hbox to 1em{\hss$\triangleright$\hss}\hfill + }% +} + +\defbeamertemplate{title separator two}{simple}{ + \hbox to \hsize{\hrulefill}% +} +\defbeamertemplate{title separator two}{triangle}{ + \hbox to \hsize{% + \tiny\leaders\hbox to 1em{\hss$\triangleleft$\hss}\hfill + }% } -\defbeamertemplate{title page}{triangle}[1][]{ +\defbeamertemplate{title page}{simple}[1][]{ \begin{beamercolorbox}[#1]{title} \usebeamerfont{title}\inserttitle \end{beamercolorbox} @@ -141,8 +101,7 @@ \end{beamercolorbox} \fi% \vskip18pt{% - \color{text1!50!back1}\leavevmode\tiny - \leaders\hbox to 1em{\hss$\triangleright$\hss}\hfill + \usebeamercolor[fg]{title separator one}\usebeamertemplate{title separator one}% }\vskip18pt \begin{beamercolorbox}[#1]{author} \usebeamerfont{author}\insertauthor @@ -154,40 +113,56 @@ \end{beamercolorbox} \fi% \vskip18pt{% - \color{text1!50!back1}\leavevmode\tiny - \leaders\hbox to 1em{\hss$\triangleleft$\hss}\hfill + \usebeamercolor[fg]{title separator two}\usebeamertemplate{title separator two}% }\vskip18pt \begin{beamercolorbox}[#1]{date} \usebeamerfont{date}\insertdate \end{beamercolorbox} } -\setbeamertemplate{itemize items}[default] -\setbeamertemplate{enumerate items}[default] - -\setbeamertemplate{section in toc}[sections numbered] -\setbeamertemplate{subsection in toc}{} - % sections and subsections -\AtBeginSection[]{\frame{\sectionpage}} +% create new template for section +\defbeamertemplate{section}{simple}{% + \insertsectionnumber.\hspace*{1ex}\insertsection% +} + +\AtBeginSection[]{\frame[plain]{\sectionpage}} \defbeamertemplate{section page}{simple}{ - \begin{center} - \usebeamerfont{section in toc} - \tableofcontents[sectionstyle=show/hide,subsectionstyle=hide] - \end{center} + \begin{beamercolorbox}[wd=\textwidth,center]{section title}% + \usebeamerfont{section title} + \usebeamertemplate{section}% + \end{beamercolorbox} + {% + \usebeamercolor[fg]{title separator one}% + \usebeamertemplate{title separator one}% + }% +} + +% create new template for subsection +\defbeamertemplate{subsection}{simple}{% + \insertsectionnumber.\insertsubsectionnumber\hspace*{2ex}\insertsubsection% } -\setbeamertemplate{section page}[simple] -\AtBeginSubsection[]{\frame{\subsectionpage}} +\AtBeginSubsection[]{\frame[plain]{\subsectionpage}} \defbeamertemplate{subsection page}{simple}{ - \begin{beamercolorbox}[wd=\paperwidth,center]{subsection in toc}% - \usebeamerfont{subsection in toc}\insertsectionnumber.\insertsubsectionnumber\hspace*{2ex}\insertsubsection% + \begin{beamercolorbox}[wd=\textwidth,center]{subsection title}% + \usebeamerfont{subsection title}% + \usebeamertemplate{subsection}% \end{beamercolorbox}% + {% + \usebeamercolor[fg]{title separator one}% + \usebeamertemplate{title separator one}% + }% +} + +\defbeamertemplate{subsection in toc}{triangle}{% + \leavevmode\leftskip=2.5em\scriptsize\raise1.25pt% + \rlap{\hskip-1.5em\donotcoloroutermaths$\blacktriangleright$}% + \normalsize\inserttocsubsection\par } -\setbeamertemplate{subsection page}[simple] % disable block style for theorems @@ -218,91 +193,99 @@ \setbeamerfont{author}{size=\large} \setbeamerfont{institute}{size=\normalsize} \setbeamerfont{date}{size=\large} -\setbeamerfont{section in toc}{size=\Large} -\setbeamerfont{subsection in toc}{size=\large} +\setbeamerfont{section in toc}{size=\large} +\setbeamerfont{subsection in toc}{size=\normalsize} \setbeamerfont{frametitle}{size=\large} +\setbeamerfont{block title}{size=\normalsize} \usefonttheme{professionalfonts} % there is some problem with default math fonts -%\usepackage{arev} +\usepackage{arev} % use arev sans font %% -------------------- color theme -------------------- -% always use rgb colors in pdf files -\substitutecolormodel{hsb}{rgb} - \def\beamer@epyt@style@do@alpha{ \definecolor{gray1}{gray}{0.1} - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{azure39}{Hsb}{210,0.3,0.9} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \colorlet{text1}{white} - \colorlet{back1}{black} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{azure39}{HTML}{A1C3E5} + \definecolor{magenta69}{HTML}{E55CE5} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{black} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=black,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=azure39} \setbeamercolor{footline}{bg=,fg=white} \setbeamertemplate{background canvas}[myshading][top=black,middle=gray1,bottom=darkgray] - \setbeamertemplate{background}[line] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] \setbeamertemplate{title page}[simple][left] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] \setbeamertemplate{proof end}[default] } \def\beamer@epyt@style@do@beta{ - \definecolor{red99}{Hsb}{0,0.9,0.9} - \definecolor{yellow86}{Hsb}{60,0.8,0.6} - \definecolor{cyan95}{Hsb}{180,0.9,0.5} - \definecolor{blue77}{Hsb}{240,0.7,0.7} - \definecolor{blue99}{Hsb}{240,0.9,0.9} - \definecolor{magenta88}{Hsb}{300,0.8,0.8} - \colorlet{text1}{black} - \colorlet{back1}{white} - \colorlet{accent1}{blue99} - \colorlet{accent2}{cyan95} - \colorlet{accent3}{red99} - \colorlet{accent4}{yellow86} - \colorlet{accent5}{magenta88} + \definecolor{red99}{HTML}{E61717} + \definecolor{yellow86}{HTML}{99991F} + \definecolor{cyan95}{HTML}{0D8080} + \definecolor{blue77}{HTML}{3636B2} + \definecolor{blue99}{HTML}{1717E6} + \definecolor{magenta88}{HTML}{CC29CC} + \colorlet{fgcolor}{black} + \colorlet{bgcolor}{white} + \colorlet{acolor1}{blue99} + \colorlet{acolor2}{cyan95} + \colorlet{acolor3}{red99} + \colorlet{acolor4}{yellow86} + \colorlet{acolor5}{magenta88} \setbeamercolor{normal text}{bg=white,fg=black} \setbeamercolor{structure}{fg=blue99} \setbeamercolor{local structure}{fg=cyan95} \setbeamercolor{footline}{bg=blue77,fg=white} \setbeamertemplate{background canvas}[default] - \setbeamertemplate{background}[line] - \setbeamertemplate{title page}[triangle][center] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] + \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[simple] \setbeamertemplate{theorem end}[simple] \setbeamertemplate{proof begin}[simple] \setbeamertemplate{proof end}[simple] } \def\beamer@epyt@style@do@delta{ - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{azure39}{Hsb}{210,0.3,0.9} - \definecolor{blue77}{Hsb}{240,0.7,0.7} - \definecolor{blue88}{Hsb}{240,0.8,0.8} - \definecolor{blue97}{Hsb}{240,0.9,0.7} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \definecolor{purple94}{Hsb}{330,0.9,0.4} - \colorlet{text1}{white} - \colorlet{back1}{blue77} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{azure39}{HTML}{A1C3E5} + \definecolor{blue77}{HTML}{3636B2} + \definecolor{blue88}{HTML}{2929CC} + \definecolor{blue97}{HTML}{1212B3} + \definecolor{magenta69}{HTML}{E55CE5} + \definecolor{purple94}{HTML}{660A38} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{blue77} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=blue77,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=azure39} @@ -311,29 +294,34 @@ \setbeamercolor{navigation symbols dimmed}{fg=purple94} \setbeamertemplate{background canvas}[myshading][top=blue97,middle=blue77,bottom=blue97] \setbeamertemplate{background}[grid][step=1mm,color=blue88] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[simple] + \setbeamertemplate{title separator two}[simple] \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[simple] \setbeamertemplate{theorem end}[simple] \setbeamertemplate{proof begin}[simple] \setbeamertemplate{proof end}[simple] } \def\beamer@epyt@style@do@gamma{ - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{brown96}{Hsb}{30,0.9,0.6} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{green33}{Hsb}{120,0.3,0.3} - \definecolor{green39}{Hsb}{120,0.3,0.9} - \definecolor{green53}{Hsb}{120,0.5,0.3} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \colorlet{text1}{white} - \colorlet{back1}{green33} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{brown96}{HTML}{99540F} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{green33}{HTML}{364D36} + \definecolor{green39}{HTML}{A1E5A1} + \definecolor{green53}{HTML}{264D26} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{magenta69}{HTML}{E55CE5} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{green33} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=green33,fg=white} \setbeamercolor{structure}{fg=yellow} \setbeamercolor{local structure}{fg=green39} @@ -342,28 +330,33 @@ \setbeamercolor{navigation symbols dimmed}{fg=brown96} \setbeamertemplate{background canvas}[default] \setbeamertemplate{background}[grid][step=1mm,color=green53] - \setbeamertemplate{title page}[triangle][left] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] + \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] \setbeamertemplate{proof end}[default] } \def\beamer@epyt@style@do@zeta{ - \definecolor{red85}{Hsb}{0,0.8,0.5} - \definecolor{red87}{Hsb}{0,0.8,0.7} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{blue5x}{Hsb}{240,0.5,1} - \definecolor{magenta6x}{Hsb}{300,0.6,1} - \colorlet{text1}{white} - \colorlet{back1}{red87} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{magenta6x} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{blue5x} + \definecolor{red85}{HTML}{801919} + \definecolor{red87}{HTML}{B32424} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{blue5x}{HTML}{8080FF} + \definecolor{magenta6x}{HTML}{FF66FF} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{red87} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{magenta6x} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{blue5x} \setbeamercolor{normal text}{bg=red87,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=yellow99} @@ -371,8 +364,13 @@ \setbeamercolor{navigation symbols}{bg=black} \setbeamercolor{navigation symbols dimmed}{fg=black} \setbeamertemplate{background canvas}[myshading][top=red85,middle=red87,bottom=red85] - \setbeamertemplate{background}[brick] - \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[simple] + \setbeamertemplate{title separator two}[simple] + \setbeamertemplate{title page}[simple][left] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] @@ -381,24 +379,38 @@ \let\beamer@epyt@style@do@default=\beamer@epyt@style@do@beta \def\beamer@epyt@style@do@common{ - \colorlet{filler1}{accent1!50!back1} - \colorlet{filler2}{accent2!50!back1} - \colorlet{filler3}{accent3!50!back1} - \colorlet{filler4}{accent4!50!back1} - \colorlet{filler5}{accent5!50!back1} + \colorlet{fcolor1}{acolor1!50!bgcolor} + \colorlet{fcolor2}{acolor2!50!bgcolor} + \colorlet{fcolor3}{acolor3!50!bgcolor} + \colorlet{fcolor4}{acolor4!50!bgcolor} + \colorlet{fcolor5}{acolor5!50!bgcolor} + \setbeamercolor{title separator one}{fg=fgcolor!50!bgcolor} + \setbeamercolor{title separator two}{fg=fgcolor!50!bgcolor} \setbeamercolor{title}{use=structure,fg=structure.fg} \setbeamercolor{subtitle}{use={structure,normal text},fg=structure.fg!90!normal text.bg} \setbeamercolor{section in toc}{parent=title} \setbeamercolor{subsection in toc}{parent=subtitle} + \setbeamercolor{section in toc shaded}{parent=normal text} + \setbeamercolor{subsection in toc shaded}{parent=normal text} \setbeamercolor{frametitle}{parent=title} \setbeamercolor{theoremname}{parent=subtitle} \setbeamercolor{proofname}{parent=subtitle} - \setbeamercolor{block title}{fg=accent1,bg=darkgray} + \setbeamercolor{block title}{fg=acolor1,bg=darkgray} \setbeamercolor{block body}{bg=gray} - \setbeamercolor{block title example}{fg=accent2,bg=darkgray} + \setbeamercolor{block title example}{fg=acolor2,bg=darkgray} \setbeamercolor{block body example}{bg=gray} - \setbeamercolor{block title alerted}{fg=accent3,bg=darkgray} + \setbeamercolor{block title alerted}{fg=acolor3,bg=darkgray} \setbeamercolor{block body alerted}{bg=gray} + \setbeamertemplate{frametitle}[simple] + \setbeamertemplate{navigation symbols}{} + \setbeamertemplate{section}[simple] + \setbeamertemplate{subsection}[simple] + \setbeamertemplate{section in toc}[sections numbered] + \setbeamertemplate{subsection in toc}[triangle] + \setbeamertemplate{section in toc shaded}[default][100] + \setbeamertemplate{subsection in toc shaded}[default][100] + \setbeamertemplate{itemize items}[default] + \setbeamertemplate{enumerate items}[default] } %% apply user selected theme at last @@ -433,7 +445,7 @@ \setbeamercolor{subtitle}{fg=blue!70!gray} \setbeamercolor{section in toc}{fg=blue!90!gray} \setbeamercolor{subsection in toc}{fg=blue!80!gray} - \setbeamercolor{frametitle}{fg=blue!70!gray} + \setbeamercolor{frametitle}{fg=blue!70!gray,bg=white} \setbeamercolor{theoremname}{fg=blue!60!gray} \setbeamercolor{proofname}{fg=blue!60!gray} \setbeamercolor{footline}{bg=white,fg=black} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-epyt.tlpobj new/tlpkg/tlpobj/beamertheme-epyt.tlpobj --- old/tlpkg/tlpobj/beamertheme-epyt.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-epyt.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -1,17 +1,17 @@ name beamertheme-epyt category Package -revision 41159 +revision 41404 shortdesc A simple and clean theme for LaTeX beamer class relocated 1 -longdesc Epyt is a simple but nice theme for Beamer, with the following -longdesc features: simple structure: with page numbers at footer, no -longdesc head bar and side bar simple templates: displaying theorems -longdesc with traditional inline style simple colors: using only several -longdesc foreground and background colors +longdesc This package provides a simple but nice theme for Beamer, with +longdesc the following features: simple structure: with page numbers at +longdesc footer, no head bar and side bar simple templates: displaying +longdesc theorems with traditional inline style simple colors: using +longdesc only several foreground and background colors runfiles size=4 RELOC/tex/latex/beamertheme-epyt/beamerthemeepyt.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamertheme-epyt -catalogue-date 2016-05-15 14:28:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation -catalogue-version 0.8 +catalogue-version 1.0 ++++++ beamertheme-metropolis.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-metropolis/README.md new/doc/latex/beamertheme-metropolis/README.md --- old/doc/latex/beamertheme-metropolis/README.md 2016-03-14 22:25:03.000000000 +0100 +++ new/doc/latex/beamertheme-metropolis/README.md 2017-01-24 00:01:03.000000000 +0100 @@ -66,6 +66,9 @@ Detailed information on using Metropolis can be found in the [manual][]. +For an alternative dark color theme, please have a look at Ross Churchley's +excellent [owl](https://github.com/rchurchley/beamercolortheme-owl) theme. + ## License Binary files old/doc/latex/beamertheme-metropolis/demo.pdf and new/doc/latex/beamertheme-metropolis/demo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-metropolis/demo.tex new/doc/latex/beamertheme-metropolis/demo.tex --- old/doc/latex/beamertheme-metropolis/demo.tex 2016-03-14 22:25:03.000000000 +0100 +++ new/doc/latex/beamertheme-metropolis/demo.tex 2017-01-24 00:01:03.000000000 +0100 @@ -185,7 +185,7 @@ \begin{frame}{Tables} \begin{table} \caption{Largest cities in the world (source: Wikipedia)} - \begin{tabular}{lr} + \begin{tabular}{@{} lr @{}} \toprule City & Population\\ \midrule Binary files old/doc/latex/beamertheme-metropolis/metropolistheme.pdf and new/doc/latex/beamertheme-metropolis/metropolistheme.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-metropolis.doc.tlpobj new/tlpkg/tlpobj/beamertheme-metropolis.doc.tlpobj --- old/tlpkg/tlpobj/beamertheme-metropolis.doc.tlpobj 2016-04-14 18:38:49.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-metropolis.doc.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -1,9 +1,9 @@ name beamertheme-metropolis.doc category Package -revision 40024 +revision 43031 shortdesc doc files of beamertheme-metropolis relocated 1 -docfiles size=51 +docfiles size=50 RELOC/doc/latex/beamertheme-metropolis/README.md RELOC/doc/latex/beamertheme-metropolis/demo.bib RELOC/doc/latex/beamertheme-metropolis/demo.pdf ++++++ beamertheme-metropolis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty new/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty --- old/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty 2017-01-24 00:01:04.000000000 +0100 @@ -0,0 +1,39 @@ +%% +%% This is file `beamercolorthememetropolis-highcontrast.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% beamercolorthememetropolis-highcontrast.dtx (with options: `package') +%% --------------------------------------------------------------------------- +%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of +%% contributors can be found at +%% +%% https://github.com/matze/mtheme/graphs/contributors +%% +%% and the original template was based on the HSRM theme by Benjamin Weiss. +%% +%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 +%% International License (https://creativecommons.org/licenses/by-sa/4.0/). +%% --------------------------------------------------------------------------- +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{beamercolorthememetropolis-highcontrast}[2017/01/23 Metropolis color theme] +\usecolortheme{metropolis} + +\definecolor{mAlert}{HTML}{AD003D} +\definecolor{mExample}{HTML}{005580} + +\setbeamercolor{normal text}{% + fg=black, + bg=white +} +\setbeamercolor{alerted text}{% + fg=mAlert, +} +\setbeamercolor{example text}{% + fg=mExample, +} +\mode<all> +\endinput +%% +%% End of file `beamercolorthememetropolis-highcontrast.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty new/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty --- old/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty 2017-01-24 00:01:04.000000000 +0100 @@ -17,7 +17,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthememetropolis}[2016/03/14 Metropolis color theme] +\ProvidesPackage{beamercolorthememetropolis}[2017/01/23 Metropolis color theme] \RequirePackage{pgfopts} \pgfkeys{ /metropolis/color/block/.cd, @@ -46,6 +46,7 @@ fg=black!2, bg=mDarkTeal } + \usebeamercolor[fg]{normal text} } \newcommand{\metropolis@colors@light}{ \setbeamercolor{normal text}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty new/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty --- old/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty 2017-01-24 00:01:04.000000000 +0100 @@ -17,13 +17,17 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthememetropolis}[2016/03/14 Metropolis font theme] +\ProvidesPackage{beamerfontthememetropolis}[2017/01/23 Metropolis font theme] \RequirePackage{etoolbox} \RequirePackage{ifxetex} \RequirePackage{ifluatex} \RequirePackage{pgfopts} \ifboolexpr{bool {xetex} or bool {luatex}}{ - \RequirePackage[no-math]{fontspec} + \@ifpackageloaded{fontspec}{ + \PassOptionsToPackage{no-math}{fontspec} + }{ + \RequirePackage[no-math]{fontspec} + } \newcounter{fontsnotfound} \newcommand{\checkfont}[1]{% \suppressfontnotfounderror=1% @@ -243,31 +247,57 @@ {\def\inserttitle{#2}}% {\def\inserttitle{\metropolis@titleformat{#2}}}% {}% - {\PackageError{beamerfontthememetropolis}{Patching title failed}} + {\PackageError{beamerfontthememetropolis}{Patching title failed}\@ehc} \patchcmd{\beamer@subtitle}% {\def\insertsubtitle{#2}}% {\def\insertsubtitle{\metropolis@subtitleformat{#2}}}% {}% - {\PackageError{beamerfontthememetropolis}{Patching subtitle failed}} + {\PackageError{beamerfontthememetropolis}{Patching subtitle failed}\@ehc} \patchcmd{\sectionentry} {\def\insertsectionhead{#2}} {\def\insertsectionhead{\metropolis@sectiontitleformat{#2}}} {} - {\PackageError{beamerfontthememetropolis}{Patching section title failed}} + {\PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc} +\@tempswafalse \patchcmd{\beamer@section} {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}} {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{% \metropolis@sectiontitleformat{#1}}}} + {\@tempswatrue} + {} +\patchcmd{\beamer@section} + {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}} + {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{% + \noexpand\metropolis@sectiontitleformat{#1}}}} + {\@tempswatrue} + {} +\if@tempswa\else + \PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc +\fi +\@tempswafalse +\patchcmd{\beamer@subsection} + {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}} + {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{% + \metropolis@sectiontitleformat{#1}}}} + {\@tempswatrue} + {} +\patchcmd{\beamer@subsection} + {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}} + {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{% + \noexpand\metropolis@sectiontitleformat{#1}}}} + {\@tempswatrue} {} - {\PackageError{beamerfontthememetropolis}{Patching section title failed}} +\if@tempswa\else + \PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc +\fi \patchcmd{\beamer@@frametitle} - {\beamer@ifempty{#2}{}{% + {{% \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space% \usebeamertemplate*{frametitle continuation}\fi}}% \gdef\beamer@frametitle{#2}% \gdef\beamer@shortframetitle{#1}% }} - {\beamer@ifempty{#2}{}{% + {{% \gdef\insertframetitle{{\metropolis@frametitleformat{#2}\ifnum% \beamer@autobreakcount>0\relax{}\space% \usebeamertemplate*{frametitle continuation}\fi}}% @@ -275,7 +305,7 @@ \gdef\beamer@shortframetitle{#1}% }} {} - {\PackageError{beamerfontthememetropolis}{Patching frame title failed}} + {\PackageError{beamerfontthememetropolis}{Patching frame title failed}\@ehc} \metropolis@font@setdefaults \ProcessPgfPackageOptions{/metropolis/font} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty new/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty --- old/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty 2017-01-24 00:01:04.000000000 +0100 @@ -17,7 +17,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthememetropolis}[2016/03/14 Metropolis inner theme] +\ProvidesPackage{beamerinnerthememetropolis}[2017/01/23 Metropolis inner theme] \RequirePackage{etoolbox} \RequirePackage{keyval} \RequirePackage{calc} @@ -86,13 +86,16 @@ \vspace*{0.5em} } \setbeamertemplate{subtitle}{ + \raggedright% \insertsubtitle% \par% \vspace*{0.5em} } +\newlength{\metropolis@titleseparator@linewidth} +\setlength{\metropolis@titleseparator@linewidth}{0.4pt} \setbeamertemplate{title separator}{ \begin{tikzpicture} - \draw[fg, fill=fg] (0,0) rectangle (\textwidth, 0.4pt); + \fill[fg] (0,0) rectangle (\textwidth, \metropolis@titleseparator@linewidth); \end{tikzpicture}% \par% } @@ -116,10 +119,10 @@ \usebeamercolor[fg]{section title} \usebeamerfont{section title} \insertsectionhead\par - \ifx\insertsubsection\@empty\else + \ifx\insertsubsectionhead\@empty\else \usebeamercolor[fg]{subsection title} \usebeamerfont{subsection title} - \insertsubsection + \insertsubsectionhead \fi \end{center} } @@ -132,10 +135,10 @@ \insertsectionhead\\[-1ex] \usebeamertemplate*{progress bar in section page} \par - \ifx\insertsubsection\@empty\else% + \ifx\insertsubsectionhead\@empty\else% \usebeamercolor[fg]{subsection title}% \usebeamerfont{subsection title}% - \insertsubsection + \insertsubsectionhead \fi \end{minipage} \par @@ -173,13 +176,15 @@ } } \newlength{\metropolis@progressonsectionpage} +\newlength{\metropolis@progressonsectionpage@linewidth} +\setlength{\metropolis@progressonsectionpage@linewidth}{0.4pt} \setbeamertemplate{progress bar in section page}{ \setlength{\metropolis@progressonsectionpage}{% \textwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}% }% \begin{tikzpicture} - \draw[bg, fill=bg] (0,0) rectangle (\textwidth, 0.4pt); - \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressonsectionpage, 0.4pt); + \fill[bg] (0,0) rectangle (\textwidth, \metropolis@progressonsectionpage@linewidth); + \fill[fg] (0,0) rectangle (\metropolis@progressonsectionpage, \metropolis@progressonsectionpage@linewidth); \end{tikzpicture}% } \def\inserttotalframenumber{100} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty new/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty --- old/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty 2017-01-24 00:01:04.000000000 +0100 @@ -17,7 +17,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthememetropolis}[2016/03/14 Metropolis outer theme] +\ProvidesPackage{beamerouterthememetropolis}[2017/01/23 Metropolis outer theme] \RequirePackage{etoolbox} \RequirePackage{calc} \RequirePackage{pgfopts} @@ -95,10 +95,19 @@ leftskip=\metropolis@frametitle@padding,% rightskip=\metropolis@frametitle@padding,% ]{frametitle}% - \metropolis@frametitlestrut@start\insertframetitle\metropolis@frametitlestrut@end% + \metropolis@frametitlestrut@start% + \insertframetitle% + \nolinebreak% + \metropolis@frametitlestrut@end% \end{beamercolorbox}% } +\setbeamertemplate{frametitle continuation}{% + \usebeamerfont{frametitle} + \romannumeral \insertcontinuationcount +} \newlength{\metropolis@progressinheadfoot} +\newlength{\metropolis@progressinheadfoot@linewidth} +\setlength{\metropolis@progressinheadfoot@linewidth}{0.4pt} \setbeamertemplate{progress bar in head/foot}{ \nointerlineskip \setlength{\metropolis@progressinheadfoot}{% @@ -106,8 +115,8 @@ }% \begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot} \begin{tikzpicture} - \draw[bg, fill=bg] (0,0) rectangle (\paperwidth, 0.4pt); - \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressinheadfoot, 0.4pt); + \fill[bg] (0,0) rectangle (\paperwidth, \metropolis@progressinheadfoot@linewidth); + \fill[fg] (0,0) rectangle (\metropolis@progressinheadfoot, \metropolis@progressinheadfoot@linewidth); \end{tikzpicture}% \end{beamercolorbox} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty new/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty --- old/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty 2017-01-24 00:01:04.000000000 +0100 @@ -18,7 +18,7 @@ %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthememetropolis} - [2016/03/14 v1.1 Metropolis Beamer theme] + [2017/01/23 v1.2 Metropolis Beamer theme] \RequirePackage{etoolbox} \RequirePackage{pgfopts} \pgfkeys{/metropolis/.cd, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty new/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty --- old/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty 2016-03-14 22:25:03.000000000 +0100 +++ new/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty 2017-01-24 00:01:04.000000000 +0100 @@ -18,7 +18,7 @@ %% --------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pgfplotsthemetol} - [2016/03/14 PGFplots colors based on Paul Tol's SRON technical note] + [2017/01/23 PGFplots colors based on Paul Tol's SRON technical note] \definecolor{TolDarkPurple}{HTML}{332288} \definecolor{TolDarkBlue}{HTML}{6699CC} \definecolor{TolLightBlue}{HTML}{88CCEE} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-metropolis.tlpobj new/tlpkg/tlpobj/beamertheme-metropolis.tlpobj --- old/tlpkg/tlpobj/beamertheme-metropolis.tlpobj 2016-04-14 18:38:49.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-metropolis.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -1,12 +1,13 @@ name beamertheme-metropolis category Package -revision 40024 +revision 43031 shortdesc A modern LaTeX beamer theme relocated 1 longdesc The package provides a simple, modern Beamer theme for anyone longdesc to use. It tries to minimize noise and maximize space for longdesc content. -runfiles size=11 +runfiles size=12 + RELOC/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty RELOC/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty RELOC/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty RELOC/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty @@ -14,7 +15,7 @@ RELOC/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty RELOC/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/metropolis -catalogue-date 2016-03-14 12:41:08 +0100 +catalogue-date 2017-01-23 14:16:26 +0100 catalogue-license other-free catalogue-topics presentation -catalogue-version 1.1 +catalogue-version 1.2 ++++++ beamertheme-phnompenh.doc.tar.xz ++++++ ++++++ beamertheme-phnompenh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-phnompenh.tlpobj new/tlpkg/tlpobj/beamertheme-phnompenh.tlpobj --- old/tlpkg/tlpobj/beamertheme-phnompenh.tlpobj 2016-04-14 18:38:49.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-phnompenh.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/beamertheme-phnompenh/beamerthemePhnomPenh.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/phnompenh -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics presentation catalogue-version 1.0 ++++++ beamertheme-upenn-bc.doc.tar.xz ++++++ ++++++ beamertheme-upenn-bc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-upenn-bc.tlpobj new/tlpkg/tlpobj/beamertheme-upenn-bc.tlpobj --- old/tlpkg/tlpobj/beamertheme-upenn-bc.tlpobj 2016-04-14 18:38:50.000000000 +0200 +++ new/tlpkg/tlpobj/beamertheme-upenn-bc.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/beamertheme-upenn-bc/beamercolorthemegoeagles.sty RELOC/tex/latex/beamertheme-upenn-bc/beamercolorthemepenn.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/upenn-bc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 1.0 ++++++ beamerthemejltree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerthemejltree.tlpobj new/tlpkg/tlpobj/beamerthemejltree.tlpobj --- old/tlpkg/tlpobj/beamerthemejltree.tlpobj 2016-04-14 18:38:50.000000000 +0200 +++ new/tlpkg/tlpobj/beamerthemejltree.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=1 RELOC/tex/latex/beamerthemejltree/beamerthemeJLTree.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamerthemeJLTree.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics presentation catalogue-version 1.1 ++++++ beamerthemenirma.doc.tar.xz ++++++ ++++++ beamerthemenirma.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerthemenirma.tlpobj new/tlpkg/tlpobj/beamerthemenirma.tlpobj --- old/tlpkg/tlpobj/beamerthemenirma.tlpobj 2016-04-14 18:38:50.000000000 +0200 +++ new/tlpkg/tlpobj/beamerthemenirma.tlpobj 2017-04-14 17:29:59.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/beamerthemenirma/beamerthemenirma.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/nirma -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 0.1 ++++++ beebe.tar.xz ++++++ ++++ 24513 lines of diff (skipped) ++++++ begingreek.doc.tar.xz ++++++ ++++++ begingreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/begingreek.tlpobj new/tlpkg/tlpobj/begingreek.tlpobj --- old/tlpkg/tlpobj/begingreek.tlpobj 2016-04-14 18:38:53.000000000 +0200 +++ new/tlpkg/tlpobj/begingreek.tlpobj 2017-04-14 17:30:01.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/begingreek/begingreek.sty catalogue-ctan /macros/latex/contrib/begingreek -catalogue-date 2015-08-03 05:58:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics greek catalogue-version 1.5 ++++++ begriff.doc.tar.xz ++++++ ++++++ begriff.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/begriff.tlpobj new/tlpkg/tlpobj/begriff.tlpobj --- old/tlpkg/tlpobj/begriff.tlpobj 2016-04-14 18:38:54.000000000 +0200 +++ new/tlpkg/tlpobj/begriff.tlpobj 2017-04-14 17:30:01.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/begriff/begriff.sty catalogue-also frege grundgesetze bguq catalogue-ctan /macros/latex/contrib/begriff -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths logic catalogue-version 1.6 ++++++ belleek.doc.tar.xz ++++++ ++++++ belleek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/belleek.tlpobj new/tlpkg/tlpobj/belleek.tlpobj --- old/tlpkg/tlpobj/belleek.tlpobj 2016-04-14 18:38:54.000000000 +0200 +++ new/tlpkg/tlpobj/belleek.tlpobj 2017-04-14 17:30:01.000000000 +0200 @@ -16,6 +16,6 @@ RELOC/fonts/type1/public/belleek/blsy.pfb RELOC/fonts/type1/public/belleek/rblmi.pfb catalogue-ctan /fonts/belleek -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-maths font-type1 ++++++ bengali.doc.tar.xz ++++++ ++++++ bengali.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bengali.tlpobj new/tlpkg/tlpobj/bengali.tlpobj --- old/tlpkg/tlpobj/bengali.tlpobj 2016-04-14 18:38:54.000000000 +0200 +++ new/tlpkg/tlpobj/bengali.tlpobj 2017-04-14 17:30:02.000000000 +0200 @@ -33,6 +33,6 @@ RELOC/tex/latex/bengali/ubnx.fd catalogue-also arosgn catalogue-ctan /language/bengali/pandey -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics indic ++++++ bera.doc.tar.xz ++++++ ++++++ bera.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bera.tlpobj new/tlpkg/tlpobj/bera.tlpobj --- old/tlpkg/tlpobj/bera.tlpobj 2016-04-14 18:38:54.000000000 +0200 +++ new/tlpkg/tlpobj/bera.tlpobj 2017-04-14 17:30:02.000000000 +0200 @@ -113,6 +113,6 @@ RELOC/tex/latex/bera/ts1fvm.fd RELOC/tex/latex/bera/ts1fvs.fd catalogue-ctan /fonts/bera -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics font font-serif font-sans font-proportional font-mono font-type1 ++++++ berenisadf.doc.tar.xz ++++++ ++++++ berenisadf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/berenisadf.tlpobj new/tlpkg/tlpobj/berenisadf.tlpobj --- old/tlpkg/tlpobj/berenisadf.tlpobj 2016-04-14 18:38:55.000000000 +0200 +++ new/tlpkg/tlpobj/berenisadf.tlpobj 2017-04-14 17:30:02.000000000 +0200 @@ -256,7 +256,7 @@ RELOC/tex/latex/berenisadf/ts1ybd2j.fd RELOC/tex/latex/berenisadf/ts1ybdj.fd catalogue-ctan /fonts/berenisadf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics font font-serif font-type1 font-otf catalogue-version 1.004 ++++++ besjournals.doc.tar.xz ++++++ ++++++ besjournals.tar.xz ++++++ ++++++ bestpapers.doc.tar.xz ++++++ ++++++ bestpapers.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bestpapers.tlpobj new/tlpkg/tlpobj/bestpapers.tlpobj --- old/tlpkg/tlpobj/bestpapers.tlpobj 2016-04-14 18:39:00.000000000 +0200 +++ new/tlpkg/tlpobj/bestpapers.tlpobj 2017-04-14 17:30:04.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/bibtex/bst/bestpapers/bestpapers-export.bst RELOC/bibtex/bst/bestpapers/bestpapers.bst catalogue-ctan /biblio/bibtex/contrib/bestpapers -catalogue-date 2015-10-28 06:30:11 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics bibtex-sty catalogue-version 1.0 ++++++ betababel.doc.tar.xz ++++++ ++++++ betababel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/betababel.tlpobj new/tlpkg/tlpobj/betababel.tlpobj --- old/tlpkg/tlpobj/betababel.tlpobj 2016-04-14 18:39:00.000000000 +0200 +++ new/tlpkg/tlpobj/betababel.tlpobj 2017-04-14 17:30:04.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/betababel/betababel.sty catalogue-ctan /macros/latex/contrib/betababel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics greek multilingual-addon catalogue-version 0.5 ++++++ beton.doc.tar.xz ++++++ ++++++ beton.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beton.tlpobj new/tlpkg/tlpobj/beton.tlpobj --- old/tlpkg/tlpobj/beton.tlpobj 2016-04-14 18:39:01.000000000 +0200 +++ new/tlpkg/tlpobj/beton.tlpobj 2017-04-14 17:30:04.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/latex/beton/beton.sty catalogue-also euler catalogue-ctan /macros/latex/contrib/beton -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 ++++++ bewerbung.doc.tar.xz ++++++ ++++++ bewerbung.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bewerbung.tlpobj new/tlpkg/tlpobj/bewerbung.tlpobj --- old/tlpkg/tlpobj/bewerbung.tlpobj 2016-04-14 18:39:01.000000000 +0200 +++ new/tlpkg/tlpobj/bewerbung.tlpobj 2017-04-14 17:30:05.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/bewerbung/bewerbung.cls RELOC/tex/latex/bewerbung/bewerbung.sty catalogue-ctan /macros/latex/contrib/bewerbung -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv class catalogue-version 1.1 ++++++ bez123.doc.tar.xz ++++++ ++++++ bez123.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bez123.tlpobj new/tlpkg/tlpobj/bez123.tlpobj --- old/tlpkg/tlpobj/bez123.tlpobj 2016-04-14 18:39:02.000000000 +0200 +++ new/tlpkg/tlpobj/bez123.tlpobj 2017-04-14 17:30:05.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/bez123/bez123.sty RELOC/tex/latex/bez123/multiply.sty catalogue-ctan /macros/latex/contrib/bez123 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-in-tex graphics-curve catalogue-version 1.1b ++++++ bezos.doc.tar.xz ++++++ ++++++ bezos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bezos.tlpobj new/tlpkg/tlpobj/bezos.tlpobj --- old/tlpkg/tlpobj/bezos.tlpobj 2016-04-14 18:39:03.000000000 +0200 +++ new/tlpkg/tlpobj/bezos.tlpobj 2017-04-14 17:30:05.000000000 +0200 @@ -21,6 +21,6 @@ RELOC/tex/latex/bezos/subdocs.sty RELOC/tex/latex/bezos/tensind.sty catalogue-ctan /macros/latex/contrib/bezos -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics collection ++++++ bgreek.doc.tar.xz ++++++ ++++++ bgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bgreek.tlpobj new/tlpkg/tlpobj/bgreek.tlpobj --- old/tlpkg/tlpobj/bgreek.tlpobj 2016-04-14 18:39:03.000000000 +0200 +++ new/tlpkg/tlpobj/bgreek.tlpobj 2017-04-14 17:30:05.000000000 +0200 @@ -308,7 +308,7 @@ RELOC/tex/latex/bgreek/bgreek.sty RELOC/tex/latex/bgreek/ibygreek.ldf catalogue-ctan /language/greek/bgreek -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics greek font font-virtual catalogue-version 0.3 ++++++ bgteubner.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/ChangeLog new/doc/latex/bgteubner/ChangeLog --- old/doc/latex/bgteubner/ChangeLog 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/ChangeLog 2017-05-06 00:36:55.000000000 +0200 @@ -1,3 +1,14 @@ +2015/05/17 v2.11 Harald Harders (harald.harders(a)gmx.de) +- Make sure that \LaTeX\ also compiles if recent changes in scrbook are + present. +- Remove \ifpdfoutput before loading pdfcprot.sty + +2015/05/15 v2.10 Harald Harders (harald.harders(a)gmx.de) +- Adapt class to support hyperref and imakeidx +- Fix PDF string issue if hyperref is loaded +- Adapt class to current scrbook version +- Fix bug in title page which made footnotes to disappear + 2012/04/07 v2.02 Harald Harders (harald.harders(a)gmx.de) - Adapted to Springer Vieweg Verlag @@ -40,12 +51,12 @@ 2004/08/19 v1.32 Harald Harders (h.harders(a)tu-bs.de) - Move \ifhhcls@times outside definition of \appendixmore. - Remove \rmfamily from pagehead since \normalfont does that already. - + 2004/05/09 v1.31 Harald Harders (h.harders(a)tu-bs.de) - Minor buxfix for titlepage. - Do not compile cdcover if cd-cover.sty is not available. - Fix documentation of \pdfoutput=0. - + 2004/04/09 v1.30 Harald Harders (h.harders(a)tu-bs.de) - Set PDF information only if PDF is produced. - Write info file containing the same information as the PDF-info entries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/Makefile.source new/doc/latex/bgteubner/Makefile.source --- old/doc/latex/bgteubner/Makefile.source 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/Makefile.source 2017-05-06 00:36:55.000000000 +0200 @@ -1,7 +1,7 @@ ## bgteubner class bundle ## ## Makefile -## Copyright 2003--2008 Harald Harders +## Copyright 2003--2017 Harald Harders # # This program may be distributed and/or modified under the # conditions of the LaTeX Project Public License, either version 1.3 @@ -82,16 +82,16 @@ install -m644 bgteubner.cls $(INSTALLDIR) install -m644 ptmxcomp.sty $(PTMXCOMPDIR) install -m644 bgteucls.pdf $(DOCDIR) - install -m644 ../doc/bgteubner-17x24-times.pdf $(DOCDIR)/bgteubner.pdf + install -m644 ../doc/bgteubner-17x24-mathtime.pdf $(DOCDIR)/bgteubner.pdf install -m644 bgteubner.ist $(IDXDIR) install -m644 bgteuglo.ist $(IDXDIR) install -m644 bgteuglochar.ist $(IDXDIR) install -m644 bgteu*.bst $(BSTDIR) texhash -zip: all - -@rm -f bgteubner-$(VERSION).zip - -@rm -f ../pakete/bgteubner-v*.zip +tds: all + -@rm -f bgteubner-$(VERSION)-tds.zip + -@rm -f ../pakete/bgteubner-v*-tds.zip mkdirhier tex/latex/bgteubner mkdirhier tex/latex/ptmxcomp mkdirhier makeindex/bgteubner @@ -103,8 +103,37 @@ cp bgteubner.ist bgteuglo.ist bgteuglochar.ist makeindex/bgteubner/ cp bgteu*.bst bibtex/bst/bgteubner/ cp bgteucls.pdf ChangeLog doc/latex/bgteubner/ + cp ../doc/bgteubner-17x24-cm.pdf doc/latex/bgteubner/bgteubner-cm.pdf + cp ../doc/bgteubner-17x24-mathtime.pdf doc/latex/bgteubner/bgteubner.pdf cp Makefile bgteucls.ins bgteucls.dtx getversion.tex source/latex/bgteubner/ - zip -r bgteubner-$(VERSION).zip tex makeindex bibtex doc source + zip -r bgteubner-$(VERSION)-tds.zip tex makeindex bibtex doc source rm -rf tex makeindex bibtex doc source - cp bgteubner-$(VERSION).zip ../pakete + cp bgteubner-$(VERSION)-tds.zip ../pakete + rm -f getversion.log + +ctan: all + -@rm -f bgteubner-$(VERSION)-ctan.zip +# -@rm -f ../pakete/bgteubner-v*-ctan.zip + mkdir bgteubner + mkdir bgteubner/source + mkdir bgteubner/hhsubfigure + mkdir bgteubner/doc + mkdir bgteubner/doc/mathtime + mkdir bgteubner/doc/src + mkdir bgteubner/doc/src/bilder + mkdir bgteubner/doc/src/bilder/seiten + cp ../LIESMICH ../README ../ToDo ../manifest.txt ../usefiles.txt bgteubner/ + cp ChangeLog Makefile bgteucls.dtx bgteucls.ins getversion.tex bgteubner/source/ + cp ptmxcomp.sty testquick.tex bgteubner/source/ + cp ../hhsubfigure/hhsubfigure.dtx ../hhsubfigure/hhsubfigure.ins bgteubner/hhsubfigure/ + cp ../hhsubfigure/README ../hhsubfigure/Makefile bgteubner/hhsubfigure/ + cp ../doc/bgteubner-17x24-mathtime.pdf bgteubner/doc/bgteubner.pdf + cp ../doc/bgteubner-17x24-cm.pdf bgteubner/doc/bgteubner-cm.pdf + cp bgteucls.pdf bgteubner/doc/ + cp ../doc/src/*.tex ../doc/src/*.sty ../doc/src/*.bib ../doc/src/Makefile bgteubner/doc/src/ + cp ../doc/src/bilder/*.* bgteubner/doc/src/bilder/ + cp ../doc/src/bilder/seiten/* bgteubner/doc/src/bilder/seiten/ + cp ../doc/mathtime/*.tex ../doc/mathtime/*.pdf bgteubner/doc/mathtime/ + zip -r bgteubner-$(VERSION)-ctan.zip bgteubner + rm -rf bgteubner rm -f getversion.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/Makefile.src new/doc/latex/bgteubner/Makefile.src --- old/doc/latex/bgteubner/Makefile.src 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/Makefile.src 2017-05-06 00:36:55.000000000 +0200 @@ -75,6 +75,12 @@ -bibtex bgteubner-a5-cm $(PDFLATEX) bgteubner-a5-cm +bgteubner-a5-mathtime.pdf: $(TEX) + -makeindex -c -g -s bgteuglochar.ist -o bgteubner-a5-mathtime.glscmd -t bgteubner-a5-mathtime.logcmd bgteubner-a5-mathtime.glocmd + -makeindex -c -g -s bgteubner.ist bgteubner-a5-mathtime + -bibtex bgteubner-a5-mathtime + $(PDFLATEX) bgteubner-a5-mathtime + class: cd ../../source && make install @@ -84,6 +90,7 @@ -rm -f bgteubner-17x24-cm.{bbl,blg,dvi,idx,ilg,ind,log,toc,glocmd,logcmd,glscmd,lox} -rm -f bgteubner-a5-times.{bbl,blg,dvi,idx,ilg,ind,log,toc,glocmd,logcmd,glscmd,lox} -rm -f bgteubner-a5-cm.{bbl,blg,dvi,idx,ilg,ind,log,toc,glocmd,logcmd,glscmd,lox} + -rm -f bgteubner-a5-mathtime.{bbl,blg,dvi,idx,ilg,ind,log,toc,glocmd,logcmd,glscmd,lox} -rm -f *.aux distclean: clean @@ -91,11 +98,13 @@ -rm -f bgteubner-17x24-mathtime.pdf -rm -f bgteubner-17x24-cm.pdf -rm -f bgteubner-a5-times.pdf + -rm -f bgteubner-a5-mathtime.pdf -rm -f bgteubner-a5-cm.pdf -rm -f bgteubner-17x24-times.info -rm -f bgteubner-17x24-mathtime.info -rm -f bgteubner-17x24-cm.info -rm -f bgteubner-a5-times.info + -rm -f bgteubner-a5-mathtime.info -rm -f bgteubner-a5-cm.info install: @@ -136,3 +145,41 @@ makeindex -c -g -s bgteubner.ist bgteubner-17x24-mathtime $(PDFLATEX) bgteubner-17x24-mathtime cp -f bgteubner-17x24-mathtime.pdf .. +# echo '' +# $(PDFLATEX) bgteubner-a5-times +# bibtex bgteubner-a5-times +# $(PDFLATEX) bgteubner-a5-times +# makeindex -c -g -s bgteuglochar.ist -o bgteubner-a5-times.glscmd \ +# -t bgteubner-a5-times.logcmd bgteubner-a5-times.glocmd +# makeindex -c -g -s bgteubner.ist bgteubner-a5-times +# $(PDFLATEX) bgteubner-a5-times +# $(PDFLATEX) bgteubner-a5-times +# makeindex -c -g -s bgteubner.ist bgteubner-a5-times +# $(PDFLATEX) bgteubner-a5-times +# cp -f bgteubner-a5-times.pdf .. +# echo '' +# $(PDFLATEX) bgteubner-a5-cm +# bibtex bgteubner-a5-cm +# $(PDFLATEX) bgteubner-a5-cm +# makeindex -c -g -s bgteuglochar.ist -o bgteubner-a5-cm.glscmd \ +# -t bgteubner-a5-cm.logcmd bgteubner-a5-cm.glocmd +# makeindex -c -g -s bgteubner.ist bgteubner-a5-cm +# $(PDFLATEX) bgteubner-a5-cm +# $(PDFLATEX) bgteubner-a5-cm +# makeindex -c -g -s bgteubner.ist bgteubner-a5-cm +# $(PDFLATEX) bgteubner-a5-cm +# cp -f bgteubner-a5-cm.pdf .. +# echo '' +# $(PDFLATEX) bgteubner-a5-mathtime +# bibtex bgteubner-a5-mathtime +# $(PDFLATEX) bgteubner-a5-mathtime +# makeindex -c -g -s bgteuglochar.ist \ +# -o bgteubner-a5-mathtime.glscmd \ +# -t bgteubner-a5-mathtime.logcmd \ +# bgteubner-a5-mathtime.glocmd +# makeindex -c -g -s bgteubner.ist bgteubner-a5-mathtime +# $(PDFLATEX) bgteubner-a5-mathtime +# $(PDFLATEX) bgteubner-a5-mathtime +# makeindex -c -g -s bgteubner.ist bgteubner-a5-mathtime +# $(PDFLATEX) bgteubner-a5-mathtime +# cp -f bgteubner-a5-mathtime.pdf .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/bgteubner-a5-mathtime.tex new/doc/latex/bgteubner/bgteubner-a5-mathtime.tex --- old/doc/latex/bgteubner/bgteubner-a5-mathtime.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bgteubner/bgteubner-a5-mathtime.tex 2017-05-06 00:36:55.000000000 +0200 @@ -0,0 +1,21 @@ +% +% bgteubner class bundle +% +% bgteubner-17x24-mathtime.tex +% Copyright 2003--2012 Harald Harders +% +% This program may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your opinion) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 1999/12/01 or later. +% +% This program consists of all files listed in manifest.txt. +% =================================================================== +\PassOptionsToClass{mathtime}{bgteubner} +\PassOptionsToClass{a5paper}{bgteubner} +% =================================================================== +\input{bgteubner} +% =================================================================== Binary files old/doc/latex/bgteubner/bgteubner-cm.pdf and new/doc/latex/bgteubner/bgteubner-cm.pdf differ Binary files old/doc/latex/bgteubner/bgteubner.pdf and new/doc/latex/bgteubner/bgteubner.pdf differ Binary files old/doc/latex/bgteubner/bgteucls.pdf and new/doc/latex/bgteubner/bgteucls.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/bgteuversion.tex new/doc/latex/bgteubner/bgteuversion.tex --- old/doc/latex/bgteubner/bgteuversion.tex 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/bgteuversion.tex 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -23,7 +23,7 @@ %% harald.harders(a)gmx.de %% \ProvidesFile{bgteuversion.tex} - [2012/04/07 v2.02 Springer Vieweg Verlag] + [2015/05/17 v2.11 Springer Vieweg Verlag] \endinput %% %% End of file `bgteuversion.tex'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/cdcover.tex new/doc/latex/bgteubner/cdcover.tex --- old/doc/latex/bgteubner/cdcover.tex 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/cdcover.tex 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -23,7 +23,7 @@ %% harald.harders(a)gmx.de %% \ProvidesFile{cdcover.tex} - [2012/04/07 v2.02 Springer Vieweg Verlag] + [2015/05/17 v2.11 Springer Vieweg Verlag] \documentclass[ngerman,a4paper,fleqn,10pt,landscape]{article} \usepackage[T1]{fontenc} \usepackage[latin1]{inputenc} @@ -69,8 +69,8 @@ \begin{tabular}{@{}>{\ttfamily}l>{\RaggedRight}p{0.7\linewidth}} alt/ & Archiv alter Versionen der Dokumentklasse \\ doc/ & Autorenrichtlinien inklusive Installationsanleitung - \url{bgteubner-17x24-times.pdf} (Times), - \url{bgteubner-17x24-cm.pdf} (European Computer Modern) und + \url{bgteubner.pdf} (Times), + \url{bgteubner-cm.pdf} (European Computer Modern) und Beschreibung der Implementation \url{bgreucls.pdf} \\ pakete/ & \textsmaller{ZIP}"=Archive der Installationsdateien \\ source/ & Quelltext der \texttt{bgteubner}"=Dokumentklasse @@ -78,8 +78,8 @@ \vspace{5mm} Lesen Sie vor der Installation und vor dem Schreiben des Buchs bitte - aufmerksam die Autorenrichtlinien \url{bgteubner-17x24-times.pdf} oder - \url{bgteubner-17x24-cm.pdf} durch. + aufmerksam die Autorenrichtlinien \url{bgteubner.pdf} oder + \url{bgteubner-cm.pdf} durch. }{% \begin{center} \sffamily\Large @@ -89,7 +89,7 @@ \vskip 2.0em \par {\bfseries\LARGE - Erstellen von B�chern f�r den Vieweg+Teubner Verlag mit \LaTeX + Erstellen von B�chern f�r den Springer Vieweg Verlag mit \LaTeX \par} \vskip 2.0em {\bfseries\Large @@ -100,18 +100,18 @@ Version \fileversion, \printdateTeX{\filedate} \par \vskip 2.0em - Vieweg+Teubner\quad Stuttgart $\cdot$ Leipzig $\cdot$ Wiesbaden + Springer Vieweg\quad Stuttgart $\cdot$ Leipzig $\cdot$ Wiesbaden \end{center} } -\backsheet{Erstellen von B�chern f�r den Vieweg+Teubner Verlag mit \LaTeX +\backsheet{Erstellen von B�chern f�r den Springer Vieweg Verlag mit \LaTeX \qquad\qquad\qquad\quad\small v\fileversion}{% \RaggedRight {\bfseries Harald Harders \par} \vskip 1em - {\Large\bfseries Erstellen von B�chern f�r den Vieweg+Teubner Verlag mit + {\Large\bfseries Erstellen von B�chern f�r den Springer Vieweg Verlag mit \LaTeX \par} \vskip 3em @@ -120,8 +120,8 @@ \url{bgteubner.cls} sowie die Autorenrichtlinien inklusive Installationsanleitung in zwei Versionen: \begin{itemize*} - \item \url{bgteubner-17x24-times.pdf}: Brotschrift Times, - \item \url{bgteubner-17x24-cm.pdf}: Brotschrift European + \item \url{bgteubner.pdf}: Brotschrift Times, + \item \url{bgteubner-cm.pdf}: Brotschrift European Computer Modern. \end{itemize*} Au�erdem sind Zusatzpakete enthalten, die in \TeX Live\,8 entweder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/ltxdoc.cfg new/doc/latex/bgteubner/ltxdoc.cfg --- old/doc/latex/bgteubner/ltxdoc.cfg 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/ltxdoc.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -%% -%% This is file `ltxdoc.cfg', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% hhsubfigure.dtx (with options: `ltxdoc') -%% -%% IMPORTANT NOTICE: -%% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from ltxdoc.cfg. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file hhsubfigure.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% @LaTeX-style-file{ -%% author = "Steven Douglas Cochran (modified by Harald Harders)", -%% version = "2.1.4", -%% date = "2003/09/14", -%% time = "09:34:13", -%% filename = "hhsubfigure.sty", -%% email = "h.harders(a)tu-bs.de", -%% codetable = "ISO/ASCII", -%% keywords = "LaTeX, float, figure, table, captcont", -%% supported = "yes", -%% abstract = "LaTeX package for providing support for the -%% inclusion of small, `sub', figures and tables. It -%% simplifies the positioning, captioning and -%% labeling of them within a single figure or table -%% environment. In addition, this package allows -%% such subcaptions to be written to the List of -%% Figures or List of tables if desired." -%% } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\AtBeginDocument{ - \EnableCrossrefs - \RecordChanges - \CodelineIndex} -\AtEndDocument{ - \PrintChanges - \PrintIndex} -\endinput -%% -%% End of file `ltxdoc.cfg'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/math-cm.info new/doc/latex/bgteubner/math-cm.info --- old/doc/latex/bgteubner/math-cm.info 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/math-cm.info 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -1. Auflage -Bild: 0; Tabelle: 0; Aufgabe: 0; Beispiel: 0; Definition: 0; Beweis: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/math-mathtime.info new/doc/latex/bgteubner/math-mathtime.info --- old/doc/latex/bgteubner/math-mathtime.info 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/math-mathtime.info 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -1. Auflage -Bild: 0; Tabelle: 0; Aufgabe: 0; Beispiel: 0; Definition: 0; Beweis: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/math.info new/doc/latex/bgteubner/math.info --- old/doc/latex/bgteubner/math.info 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/math.info 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -1. Auflage -Bild: 0; Tabelle: 0; Aufgabe: 0; Beispiel: 0; Definition: 0; Beweis: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/testquick.exercise new/doc/latex/bgteubner/testquick.exercise --- old/doc/latex/bgteubner/testquick.exercise 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/testquick.exercise 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -\addvspace {10\p@ } -\contentsline {exercise}{\hbox to\@tempdima {1.1\hfil }Hallo Moin Hallo Tach Ciao}{1} -\contentsline {exercise}{Hallo Moin Hallo Tach Ciao}{1} -\contentsline {exercise}{\hbox to\@tempdima {1.2\hfil }Hallo Moin Hallo Tach Ciao}{1} -\contentsline {exercise}{\hbox to\@tempdima {1.3\hfil }asdf}{2} -\contentsline {exercise}{\hbox to\@tempdima {1.1\hfil }Hallo Moin Hallo Tach Ciao}{2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/testquick.info new/doc/latex/bgteubner/testquick.info --- old/doc/latex/bgteubner/testquick.info 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/testquick.info 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Titel: Testdatei -1. Auflage -Autor(en): Harald Harders -Bild: 1; Tabelle: 0; Aufgabe: 5; Beispiel: 0; Definition: 0; Beweis: 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bgteubner/vorwort.tex new/doc/latex/bgteubner/vorwort.tex --- old/doc/latex/bgteubner/vorwort.tex 2012-04-09 19:06:36.000000000 +0200 +++ new/doc/latex/bgteubner/vorwort.tex 2017-05-06 00:36:55.000000000 +0200 @@ -85,6 +85,14 @@ \signature{M�lheim an der Ruhr}{im April 2012}{Harald Harders} % =================================================================== +\preface{Vorwort zu Version~2.11}% + +Aufgrund von Ver�nderungen anderer Pakete (insbesondere Koma-Script) wurde es +notwendig, diese Klasse auch anzupassen. + +\signature{M�lheim an der Ruhr}{im Mai 2015}{Harald Harders} + +% =================================================================== %%% Local Variables: %%% mode: latex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bgteubner.doc.tlpobj new/tlpkg/tlpobj/bgteubner.doc.tlpobj --- old/tlpkg/tlpobj/bgteubner.doc.tlpobj 2016-04-14 18:39:04.000000000 +0200 +++ new/tlpkg/tlpobj/bgteubner.doc.tlpobj 2017-05-06 02:06:50.000000000 +0200 @@ -1,9 +1,9 @@ name bgteubner.doc category Package -revision 25892 +revision 44205 shortdesc doc files of bgteubner relocated 1 -docfiles size=533 +docfiles size=821 RELOC/doc/latex/bgteubner/01b.png RELOC/doc/latex/bgteubner/02b.png RELOC/doc/latex/bgteubner/ChangeLog @@ -21,7 +21,9 @@ RELOC/doc/latex/bgteubner/bgteubner-17x24-mathtime.tex RELOC/doc/latex/bgteubner/bgteubner-17x24-times.tex RELOC/doc/latex/bgteubner/bgteubner-a5-cm.tex + RELOC/doc/latex/bgteubner/bgteubner-a5-mathtime.tex RELOC/doc/latex/bgteubner/bgteubner-a5-times.tex + RELOC/doc/latex/bgteubner/bgteubner-cm.pdf RELOC/doc/latex/bgteubner/bgteubner-with-hyperref.tex RELOC/doc/latex/bgteubner/bgteubner.pdf RELOC/doc/latex/bgteubner/bgteubner.tex @@ -65,20 +67,14 @@ RELOC/doc/latex/bgteubner/kapitel2.tex RELOC/doc/latex/bgteubner/literatur.bib RELOC/doc/latex/bgteubner/literatur.tex - RELOC/doc/latex/bgteubner/ltxdoc.cfg RELOC/doc/latex/bgteubner/manifest.txt - RELOC/doc/latex/bgteubner/math-cm.info RELOC/doc/latex/bgteubner/math-cm.pdf RELOC/doc/latex/bgteubner/math-cm.tex - RELOC/doc/latex/bgteubner/math-mathtime.info RELOC/doc/latex/bgteubner/math-mathtime.pdf RELOC/doc/latex/bgteubner/math-mathtime.tex - RELOC/doc/latex/bgteubner/math.info RELOC/doc/latex/bgteubner/math.pdf RELOC/doc/latex/bgteubner/math.tex RELOC/doc/latex/bgteubner/optionen-advanced.tex - RELOC/doc/latex/bgteubner/testquick.exercise - RELOC/doc/latex/bgteubner/testquick.info RELOC/doc/latex/bgteubner/testquick.tex RELOC/doc/latex/bgteubner/testtimes.tex RELOC/doc/latex/bgteubner/tex_aufruf.tex ++++++ bgteubner.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/bgteubner/bgteuabbr.bst new/bibtex/bst/bgteubner/bgteuabbr.bst --- old/bibtex/bst/bgteubner/bgteuabbr.bst 2012-04-09 19:06:36.000000000 +0200 +++ new/bibtex/bst/bgteubner/bgteuabbr.bst 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/bgteubner/bgteuabbr2.bst new/bibtex/bst/bgteubner/bgteuabbr2.bst --- old/bibtex/bst/bgteubner/bgteuabbr2.bst 2012-04-09 19:06:36.000000000 +0200 +++ new/bibtex/bst/bgteubner/bgteuabbr2.bst 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/bgteubner/bgteupln.bst new/bibtex/bst/bgteubner/bgteupln.bst --- old/bibtex/bst/bgteubner/bgteupln.bst 2012-04-09 19:06:36.000000000 +0200 +++ new/bibtex/bst/bgteubner/bgteupln.bst 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/bgteubner/bgteupln2.bst new/bibtex/bst/bgteubner/bgteupln2.bst --- old/bibtex/bst/bgteubner/bgteupln2.bst 2012-04-09 19:06:36.000000000 +0200 +++ new/bibtex/bst/bgteubner/bgteupln2.bst 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/bgteubner/bgteupln3.bst new/bibtex/bst/bgteubner/bgteupln3.bst --- old/bibtex/bst/bgteubner/bgteupln3.bst 2012-04-09 19:06:36.000000000 +0200 +++ new/bibtex/bst/bgteubner/bgteupln3.bst 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/bgteubner/bgteubner.ist new/makeindex/bgteubner/bgteubner.ist --- old/makeindex/bgteubner/bgteubner.ist 2012-04-09 19:06:36.000000000 +0200 +++ new/makeindex/bgteubner/bgteubner.ist 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/bgteubner/bgteuglo.ist new/makeindex/bgteubner/bgteuglo.ist --- old/makeindex/bgteubner/bgteuglo.ist 2012-04-09 19:06:36.000000000 +0200 +++ new/makeindex/bgteubner/bgteuglo.ist 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/bgteubner/bgteuglochar.ist new/makeindex/bgteubner/bgteuglochar.ist --- old/makeindex/bgteubner/bgteuglochar.ist 2012-04-09 19:06:36.000000000 +0200 +++ new/makeindex/bgteubner/bgteuglochar.ist 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bgteubner/bgteubner.cls new/tex/latex/bgteubner/bgteubner.cls --- old/tex/latex/bgteubner/bgteubner.cls 2012-04-09 19:06:36.000000000 +0200 +++ new/tex/latex/bgteubner/bgteubner.cls 2017-05-06 00:36:55.000000000 +0200 @@ -8,7 +8,7 @@ %% %% bgteubner class bundle %% -%% Copyright 2003--2012 Harald Harders +%% Copyright 2003--2015 Harald Harders %% %% This program may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bgteubner} - [2012/04/07 v2.02 Springer Vieweg Verlag] + [2015/05/17 v2.11 Springer Vieweg Verlag] \typeout{^^J^^JDokumentklasse zum Erstellen von Buechern fuer den Springer Vieweg Verlag, Wiesbaden}% \typeout{(vormals Vieweg+Teubner Verlag, B. G. Teubner Verlag).}% @@ -41,16 +41,9 @@ \typeout{Harald Harders (harald.harders(a)gmx.de).^^J}% \typeout{Beachten Sie die Dokumentation in den unterschiedlichen Versionen:}% -\typeout{\space\space bgteubner-17x24-times.pdf\space\space Times, - 17cm x 24cm,}% +\typeout{\space\space bgteubner.pdf (Times, 17cm x 24cm)}% \typeout{\space\space - bgteubner-17x24-cm.pdf\space\space\space\space\space European - Computer Modern, 17cm x 24cm,}% -\typeout{\space\space - bgteubner-a5-times.pdf\space\space\space\space\space Times, DIN-A 5,}% -\typeout{\space\space - bgteubner-a5-cm.pdf\space\space\space\space\space \space\space\space - European Computer Modern, DIN-A 5.}% + bgteubner-cm.pdf (European Computer Modern, 17cm x 24cm).}% \typeout{^^JDocument class to produce books for the Springer Vieweg Verlag, Wiesbaden, Germany}% \typeout{(formerly Vieweg+Teubner Verlag, B. G. Teubner Verlag).}% @@ -111,16 +104,16 @@ \@popfilename \@reset@ptions}% \reserved@a} -\PassOptionsToClass{smallheadings}{scrbook} -\PassOptionsToClass{bibtotoc,idxtotoc,liststotoc}{scrbook} +\PassOptionsToClass{headings=small}{scrbook} +\PassOptionsToClass{bibliography=totoc,index=totoc,listof=totoc}{scrbook} \PassOptionsToClass{fleqn}{scrbook} \PassOptionsToPackage{fleqn}{amsmath} \PassOptionsToPackage{intlimits}{amsmath} -\PassOptionsToClass{pointlessnumbers}{scrbook} -\PassOptionsToClass{cleardoubleempty}{scrbook} -\PassOptionsToClass{headnosepline}{scrbook} -\PassOptionsToClass{noappendixprefix}{scrbook} -\PassOptionsToClass{tablecaptionabove}{scrbook} +\PassOptionsToClass{numbers=noenddot}{scrbook} +\PassOptionsToClass{cleardoublepage=empty}{scrbook} +\PassOptionsToClass{headsepline=false}{scrbook} +\PassOptionsToClass{appendixprefix=false}{scrbook} +\PassOptionsToClass{captions=tableheading}{scrbook} \PassOptionsToPackage{pagesize,headinclude}{typearea} \newif\ifhhcls@dinafuenf \DeclareOption{a5paper}{\hhcls@dinafuenftrue} @@ -177,8 +170,8 @@ \ExecuteOptions{times,headingoutside,17x24,tocindent,% normaltheorem,springervieweg} \ProcessOptions\relax -\PassOptionsToClass{10pt}{scrbook} -\LoadClass{scrbook}[2003/04/22] +\PassOptionsToClass{fontsize=10pt}{scrbook} +\LoadClass{scrbook}[2011/06/16] \let\scr@fnt@wrn@pagehead=\@undefined \let\scr@fnt@wrn@pagefoot=\@undefined \RequirePackage{fixltx2e}[2000/09/24] @@ -292,6 +285,7 @@ \RequirePackage{fnbreak}[2003/04/03] \RequirePackage[countmax]{subfloat}[2002/12/16] \RequirePackage{multicol}[2000/07/10] +\let\ifpdfoutput\relax \RequirePackage[activate]{pdfcprot}[2002/02/27] \ifpdftex{}{% \ClassError{bgteubner}{Ordinary latex used to compile this @@ -682,34 +676,50 @@ \typeout{Number of tables: \thetabellenzahl}% \typeout{Number of exercises: \theaufgabenzahl^^J}% }% -\renewcommand*\listoffigures{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \lof@heading% - \small - \@parskipfalse\@parskip@indent% - \@starttoc{lof}% - \if@restonecol\twocolumn\fi - \endgroup -} -\renewcommand*\listoftables{% - \begingroup - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \lot@heading% - \small - \@parskipfalse\@parskip@indent% - \@starttoc{lot}% - \if@restonecol\twocolumn\fi - \endgroup -} +\@ifundefined{BeforeStartingTOC}{% + \ClassWarningNoLine{bgteubner}{Koma-Script macro + \string\BeforeStartingTOC\space not defined.\MessageBreak + Using workaround for \string\listoffigures. \MessageBreak + You should consider updating Koma-Script.}% + \renewcommand*\listoffigures{% + \begingroup% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \lof@heading% + \small + \@parskipfalse\@parskip@indent% + \@starttoc{lof}% + \if@restonecol\twocolumn\fi + \endgroup + } +}{% + \BeforeStartingTOC[lof]{\small} +}% +\@ifundefined{BeforeStartingTOC}{% + \ClassWarningNoLine{bgteubner}{Koma-Script macro + \string\BeforeStartingTOC\space not defined.\MessageBreak + Using workaround for \string\listoftables.\MessageBreak + You should consider updating Koma-Script.}% + \renewcommand*\listoftables{% + \begingroup + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \lot@heading% + \small + \@parskipfalse\@parskip@indent% + \@starttoc{lot}% + \if@restonecol\twocolumn\fi + \endgroup + } +}{% + \BeforeStartingTOC[lot]{\small} +}% \newcommand\hhcls@makeindex{} \let\hhcls@makeindex=\makeindex \renewcommand\makeindex{% @@ -766,6 +776,9 @@ \newcommand*\textbfff[1]{\textbf{#1\,ff}}% \newcommand\subind{\,--\,\hskip\z@skip}% \newcommand*\emphindex[1]{\textbf{#1}}% +\BeforePackage{imakeidx}{% + \PassOptionsToPackage{original}{imakeidx} +} \deffootnote{1.5em}{1.5em}{\normalfont\newstylenums{\thefootnotemark}\enspace} \addtokomafont{footnote}{\normalfont\RaggedRight} \deffootnotemark{\textsuperscript{\newstylenums{\thefootnotemark}}} @@ -1392,7 +1405,7 @@ \addcontentsline{#1}{#1}{##1}% \else \addcontentsline{#1}{#1}{% - \numberline {\csname thetheorem@#1\endcsname}##1}% + \protect\numberline {\csname thetheorem@#1\endcsname}##1}% \fi \fi \nobreak\ignorespaces @@ -1410,19 +1423,31 @@ \typeout{#2: \csname thetheorem@#1zahl\endcsname\space times used}% } } -\newcommand*\listoftheorems[2]{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \float@listhead{#2}% - \small - \setlength{\parskip}{\z@}% - \@starttoc{#1}% - \if@restonecol\twocolumn\fi - \endgroup +\@ifundefined{BeforeStartingTOC}{% + \ClassWarningNoLine{bgteubner}{Koma-Script macro + \string\BeforeStartingTOC\space not defined.\MessageBreak + Using workaround for \string\listoftheorems.\MessageBreak + You should consider updating Koma-Script}% + \newcommand*\listoftheorems[2]{% + \begingroup% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \float@listhead{#2}% + \small + \setlength{\parskip}{\z@}% + \@starttoc{#1}% + \if@restonecol\twocolumn\fi + \endgroup + } +}{% + \newcommand*\listoftheorems[2]{% + \expandafter\def\csname listof#1name\endcsname{#2}% + \BeforeStartingTOC[#1]{\small}% + \listoftoc{#1}% + } } \newenvironment{theoremdelimiter}[2]{% \expandafter\def\csname theorem@#1postfix\endcsname{#2}% @@ -1739,17 +1764,34 @@ \setlength{\hhcls@@exerciseindent}{7.8398em}% \newcounter{@exercise} \renewcommand*\the@exercise{\@arabic\c@@exercise} -\newcommand\@exercise{\@startsection{@exercise}{1}{\z@}% - {-3.5ex \@plus -1ex \@minus -.2ex}% - {2.3ex \(a)plus.2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@section\nobreak}} -\if@exercisetotoc - \newcommand*\l@@exercise[2]{\@dottedtocline{1}{1.5em}{2.3em}{% - \def\numberline##1{% - \hb@xt@\@tempdima{\lprefix@exercise##1\hfil}}#1}{#2}} -\else - \newcommand*\l@@exercise[2]{} -\fi +\newcommand*{\scr@fnt@@exercise}{\size@section} +\@ifundefined{DeclareSectionCommand}{% + \ClassWarningNoLine{bgteubner}{Koma-Script macro + \string\DeclareSectionCommand\space not defined.\MessageBreak + Using workaround for exercise environment.\MessageBreak + You should consider updating Koma-Script}% + \newcommand\@exercise{\@startsection{@exercise}{1}{\z@}% + {-3.5ex \@plus -1ex \@minus -.2ex}% + {2.3ex \(a)plus.2ex}% + {\raggedsection\normalfont\sectfont\nobreak\size@section\nobreak}} + \if@exercisetotoc + \newcommand*\l@@exercise[2]{\@dottedtocline{1}{1.5em}{2.3em}{% + \def\numberline##1{% + \hb@xt@\@tempdima{\lprefix@exercise##1\hfil}}#1}{#2}} + \else + \newcommand*\l@@exercise[2]{} + \fi +}{% + \DeclareSectionCommand[% + style=section,% + level=1,% + indent=\z@,% + beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,% + afterskip=2.3ex \(a)plus.2ex,% + tocindent=1.5em,% + tocnumwidth=2.3em% + ]{@exercise} +}% \newcommand*\exercisename{Aufgabe} \def\prefix@exercise{\exercisename~}% \def\postfix@exercise{:}% @@ -1765,7 +1807,7 @@ \setcounter{subtaskoffset}{0}% \stepcounter{aufgabenzahl}% \@exercise{#1}% - \addcontentsline{exercise}{exercise}{\numberline {\the@exercise}#1}% + \addcontentsline{exercise}{exercise}{\protect\numberline {\the@exercise}#1}% \gliederungsfehler{exercise}% \exercisefont }{% @@ -1912,7 +1954,7 @@ \addcontentsline{exercise}{exercise}{#1}% \else \addcontentsline{exercise}{exercise}{% - \numberline{\the@subexercise}#1}% + \protect\numberline{\the@subexercise}#1}% \fi \fi \subexercisefont @@ -1991,20 +2033,30 @@ \noindentnextpar \par } -\newcommand*\exercise@heading{\float@listhead{\listexercisename}} -\newcommand*\listofexercises{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \exercise@heading - \small - \setlength{\parskip}{\z@}% - \@starttoc{exercise}% - \if@restonecol\twocolumn\fi - \endgroup +\@ifundefined{BeforeStartingTOC}{% + \ClassWarningNoLine{bgteubner}{Koma-Script macro + \string\BeforeStartingTOC\space not defined.\MessageBreak + Using workaround for \string\listofexercises.\MessageBreak + You should consider updating Koma-Script}% + \newcommand*\exercise@heading{\float@listhead{\listexercisename}} + \newcommand*\listofexercises{% + \begingroup% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \exercise@heading + \small + \setlength{\parskip}{\z@}% + \@starttoc{exercise}% + \if@restonecol\twocolumn\fi + \endgroup + } +}{% + \newcommand*\listofexercises{\listoftoc{exercise}} + \newcommand*\listofexercisename{\listexercisename} + \BeforeStartingTOC[exercise]{\small} } \newcommand*\listexercisename{List of Exercises} \newcommand*\hhcls@germanlistexercisename{Aufgabenverzeichnis} @@ -2062,6 +2114,11 @@ #3% \end{minipage}% } +\AfterPackage{hyperref}{% + \hypersetup{% + unicode + }% +}% \let\@author=\@empty \let\@title\@empty \let\@subtitle\@empty @@ -2074,52 +2131,61 @@ \newwrite\hhcls@fileinfo \immediate\openout\hhcls(a)fileinfo\jobname.info \AtEndDocument{% + \ifx\pdfstringdef\@undefined + \def\hhcls@title{\@title}% + \ifx\@subtitle\@empty + \def\hhcls@subject{\@edition. Auflage}% + \else + \def\hhcls@subject{\@subtitle\space (\@edition. Auflage)}% + \fi + \def\hhcls@author{\@author}% + \else + \pdfstringdef\hhcls@title{\@title}% + \ifx\@subtitle\@empty + \pdfstringdef\hhcls@subject{\@edition. Auflage}% + \else + \pdfstringdef\hhcls@subject{\@subtitle\space (\@edition. Auflage)}% + \fi + \pdfstringdef\hhcls@author{\@author}% + \fi \ifpdf - \if\@title\@empty\else\pdfinfo{/Title (\@title)}\fi - \if\@subtitle\@empty - \pdfinfo{/Subject (\@edition. Auflage)}% - \else - \pdfinfo{/Subject (\@subtitle\space (\@edition. Auflage))}% - \fi - \ifx\@author\@empty - \else - \pdfinfo{/Author (\@author)}% - \fi + \ifx\@title\@empty\else\pdfinfo{/Title (\hhcls@title)}\fi + \ifx\hhcls@subject\@empty\else\pdfinfo{/Subject (\hhcls@subject)}\fi + \ifx\@author\@empty\else\pdfinfo{/Author (\hhcls@author)}\fi % If you modify a renamed copy of the files `bgteubner.cls' or % `bgteucls.dtx', you have to preserve some information in the % PDF /Creator entry. The following data have to remain: % - The name `bgteubner.cls', - % - a hint that this class has been developed for the `Teubner - % Verlag, Wiesbaden, Germany'. + % - a hint that this class has been developed for the `Springer + % Vieweg Verlag, Wiesbaden, Germany'. \begingroup \GetFileInfo{bgteubner.cls}% - \pdfinfo{/Creator (document class bgteubner.cls for the - Springer Vieweg Verlag, Wiesbaden, Germany, by Harald Harders - \fileversion)}% + \pdfinfo{/Creator (Document class bgteubner.cls for the + Springer Vieweg Verlag, Wiesbaden, Germany, by Harald Harders, + version \fileversion)}% \endgroup \pdfinfo{/Keywords (Bild: \thebilderzahl; Tabelle: \thetabellenzahl; Aufgabe: \theaufgabenzahl\hhcls@theoremanzahl)}% \fi - \if\@title\@empty + \ifx\@title\@empty \else - \immediate\write\hhcls@fileinfo{Titel: \@title}% + \protected@write\hhcls@fileinfo{}{Titel: \@title}% \fi - \if\@subtitle\@empty + \ifx\@subtitle\@empty \else - \immediate\write\hhcls@fileinfo{Untertitel: \@subtitle}% - \fi - \if\@subtitle\@empty + \protected@write\hhcls@fileinfo{}{Untertitel: \@subtitle}% \fi - \immediate\write\hhcls@fileinfo{\@edition. Auflage}% + \protected@write\hhcls@fileinfo{}{\@edition. Auflage}% \ifx\@author\@empty \else - \immediate\write\hhcls@fileinfo{Autor(en): \@author}% + \protected@write\hhcls@fileinfo{}{Autor(en): \@author}% \fi - \immediate\write\hhcls@fileinfo{Bild: \thebilderzahl; Tabelle: + \protected@write\hhcls@fileinfo{}{Bild: \thebilderzahl; Tabelle: \thetabellenzahl; Aufgabe: \theaufgabenzahl\hhcls@theoremanzahl}% } \ifhhcls@titlepage \renewcommand*\maketitle{% + \begingroup \edef\hhcls@tmppage{\arabic{page}}% \begin{titlepage}% \renewcommand{\sfdefault}{phv}% @@ -2222,6 +2288,7 @@ \if@twoside \next@tpage\cleardoublepage \fi \fi \global\let\maketitle\relax + \endgroup } \else \renewcommand\maketitle{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bgteubner.tlpobj new/tlpkg/tlpobj/bgteubner.tlpobj --- old/tlpkg/tlpobj/bgteubner.tlpobj 2016-04-14 18:39:05.000000000 +0200 +++ new/tlpkg/tlpobj/bgteubner.tlpobj 2017-05-06 02:06:51.000000000 +0200 @@ -1,6 +1,6 @@ name bgteubner category Package -revision 25892 +revision 44205 shortdesc Class for producing books for the publisher "Teubner Verlag" relocated 1 longdesc The bgteubner document class has been programmed by order of @@ -14,7 +14,7 @@ longdesc restrictions (For instance, the document class provides only longdesc two paper sizes: DIN A-5 and 17cm x 24cm; only two font longdesc families are supported: Times and European Computer Modern). -runfiles size=69 +runfiles size=70 RELOC/bibtex/bst/bgteubner/bgteuabbr.bst RELOC/bibtex/bst/bgteubner/bgteuabbr2.bst RELOC/bibtex/bst/bgteubner/bgteupln.bst @@ -28,7 +28,7 @@ RELOC/tex/latex/bgteubner/hhsubfigure.sty RELOC/tex/latex/bgteubner/ptmxcomp.sty catalogue-ctan /macros/latex/contrib/bgteubner -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-05-05 00:16:32 +0200 catalogue-license lppl catalogue-topics class book-pub publisher -catalogue-version 2.02 +catalogue-version 2.11 ++++++ bguq.doc.tar.xz ++++++ ++++++ bguq.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bguq.tlpobj new/tlpkg/tlpobj/bguq.tlpobj --- old/tlpkg/tlpobj/bguq.tlpobj 2016-04-14 18:39:06.000000000 +0200 +++ new/tlpkg/tlpobj/bguq.tlpobj 2017-04-14 17:30:06.000000000 +0200 @@ -56,7 +56,7 @@ RELOC/tex/latex/bguq/bguq.sty catalogue-also begriff frege grundgesetze catalogue-ctan /fonts/bguq -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-specialist font-maths logic catalogue-version 0.4 ++++++ bhcexam.doc.tar.xz ++++++ ++++++ bhcexam.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bhcexam.tlpobj new/tlpkg/tlpobj/bhcexam.tlpobj --- old/tlpkg/tlpobj/bhcexam.tlpobj 2016-04-14 18:39:06.000000000 +0200 +++ new/tlpkg/tlpobj/bhcexam.tlpobj 2017-04-14 17:30:07.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/bhcexam/BHCexam.cls catalogue-also exam catalogue-ctan /macros/latex/contrib/bhcexam -catalogue-date 2015-12-07 16:03:16 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics exam catalogue-version 0.4 ++++++ bib-fr.doc.tar.xz ++++++ ++++++ bib-fr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bib-fr.tlpobj new/tlpkg/tlpobj/bib-fr.tlpobj --- old/tlpkg/tlpobj/bib-fr.tlpobj 2016-04-14 18:39:06.000000000 +0200 +++ new/tlpkg/tlpobj/bib-fr.tlpobj 2017-04-14 17:30:07.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/bibtex/bst/bib-fr/unsrtnat-fr.bst catalogue-also babelbib catalogue-ctan /biblio/bibtex/contrib/bib-fr -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 french catalogue-version 1.5 ++++++ bibarts.doc.tar.xz ++++++ ++++++ bibarts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibarts.tlpobj new/tlpkg/tlpobj/bibarts.tlpobj --- old/tlpkg/tlpobj/bibarts.tlpobj 2016-04-14 18:39:08.000000000 +0200 +++ new/tlpkg/tlpobj/bibarts.tlpobj 2017-04-14 17:30:07.000000000 +0200 @@ -23,7 +23,7 @@ runfiles size=34 RELOC/tex/latex/bibarts/bibarts.sty catalogue-ctan /macros/latex/contrib/bibarts -catalogue-date 2016-03-20 22:32:54 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-supp humanities catalogue-version 2.1 ++++++ biber.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/bibtex/biber/biber.pdf and new/texmf-dist/doc/bibtex/biber/biber.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biber.doc.tlpobj new/tlpkg/tlpobj/biber.doc.tlpobj --- old/tlpkg/tlpobj/biber.doc.tlpobj 2016-05-17 03:15:33.000000000 +0200 +++ new/tlpkg/tlpobj/biber.doc.tlpobj 2017-04-19 02:06:33.000000000 +0200 @@ -1,6 +1,6 @@ name biber.doc category Package -revision 41193 +revision 43910 shortdesc doc files of biber -docfiles size=87 +docfiles size=65 texmf-dist/doc/bibtex/biber/biber.pdf ++++++ bibexport.doc.tar.xz ++++++ ++++++ bibexport.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibexport.tlpobj new/tlpkg/tlpobj/bibexport.tlpobj --- old/tlpkg/tlpobj/bibexport.tlpobj 2016-04-14 18:41:58.000000000 +0200 +++ new/tlpkg/tlpobj/bibexport.tlpobj 2017-04-14 17:31:37.000000000 +0200 @@ -13,7 +13,7 @@ texmf-dist/bibtex/bst/bibexport/export.bst texmf-dist/scripts/bibexport/bibexport.sh catalogue-ctan /biblio/bibtex/utils/bibexport -catalogue-date 2016-03-03 12:09:52 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bibtex-util catalogue-version 3.02 ++++++ bibhtml.doc.tar.xz ++++++ ++++++ bibhtml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibhtml.tlpobj new/tlpkg/tlpobj/bibhtml.tlpobj --- old/tlpkg/tlpobj/bibhtml.tlpobj 2016-04-14 18:41:58.000000000 +0200 +++ new/tlpkg/tlpobj/bibhtml.tlpobj 2017-04-14 17:31:38.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/bibtex/bst/bibhtml/plainhtmldater.bst RELOC/bibtex/bst/bibhtml/unsrthtml.bst catalogue-ctan /biblio/bibtex/contrib/bibhtml -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-util cvt-html catalogue-version 2.0.2 ++++++ biblatex-abnt.doc.tar.xz ++++++ ++++ 8429 lines of diff (skipped) ++++++ biblatex-abnt.tar.xz ++++++ ++++ 5421 lines of diff (skipped) ++++++ biblatex-anonymous.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-anonymous/biblatex-anonymous.pdf and new/doc/latex/biblatex-anonymous/biblatex-anonymous.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-anonymous/biblatex-anonymous.tex new/doc/latex/biblatex-anonymous/biblatex-anonymous.tex --- old/doc/latex/biblatex-anonymous/biblatex-anonymous.tex 2016-06-07 00:57:03.000000000 +0200 +++ new/doc/latex/biblatex-anonymous/biblatex-anonymous.tex 2017-01-24 23:01:03.000000000 +0100 @@ -16,12 +16,12 @@ \newcommand{\namebibstyle}[1]{\texttt{#1}} % Meta-datas \titlepage{% - title={Managing anonymous work with biblatex}, + title={Managing anonymous works with biblatex}, subtitle={}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.2.1}, - date={06/06/2016}, + revision={2.6.0}, + date={24/01/2017}, url={https://github.com/maieul/biblatex-anonymous}} \begin{document} @@ -32,9 +32,10 @@ \section{Introduction} -In some scholar fields, like history or philology, we have to work with anonymous work. +In some scholar fields, like history or philology, we have to work with anonymous works. This package provides facility to manage them with \biblatex, with citation and bibliography style of the \namebibstyle{verbose} family. +It is compatible with the biblatex-morenames and biblatex-realeditor package. \section{What does the package do?} @@ -43,9 +44,10 @@ \item Changing label name to author only, never editor. - \item Providing a sorting scheme to put all anonymous work at the begining of a bibliography. This sorting scheme is derivated from \verb+nyt+ scheme. + \item Providing a sorting scheme to put all anonymous works at the beginning of a bibliography. This sorting scheme is derivated from \verb+nyt+ scheme. \item For French, changing \enquote{\selectlanguage{french}dir.} by \enquote{\selectlanguage{french}éd.}. \item Printing only the author name before the title, and never the editor, even if the book is anonymous. + \item Fixing \biblatex\ bug with \expandafter\cs\expandafter{\prm{xx}cites} command when using anonymous works.\footnote{\url{https://github.com/plk/biblatex/issues/285}.} \end{enumerate} @@ -64,29 +66,31 @@ \begin{itemize} \item To \biblatex package, to apply it to all bibliographies. - \item To \cs{printbibliography} command, to apply it to a single bibliography. + \item To an optional argument of a \cs{refcontext} environment, to apply it to a single bibliography. \end{itemize} + +The package also provides a \verb-anonymous+manuscripts- sorting scheme to use in combination with the \emph{biblatex-manuscripts-philology} package (please read handbook of this package for more details about it). \subsection{Making exceptions} If you want to use the \bibfield{editor} or \bibfield{translator} for a entry concerned by this package (e.g. \bibtype{book}, \bibtype{bookinbook} etc.), you can use the \verb+useeditor=true+ or \verb+usetranslator=true+ option in the \bibfield{options} field. However, in many case, such entry should be a \bibtype{proceedings} or \bibtype{collection}. -\subsection{Anonymous work edited on not anonymous books}\label{noinherit} +\subsection{Anonymous works edited on not anonymous books}\label{noinherit} -Sometime, an anonymous \bibtype{bookinbook} is printed in a NOT anonymous work. +Sometime, an anonymous \bibtype{bookinbook} is printed in a NOT anonymous book. If you use cross-referencing system, you would like to NOT inherit the \bibfield{name} from the main entry in the subentry. -\textbf{From \biblatex~3.4.0}, you can use entry option \opt{noinherit=noauthor} as in the following example: +\textbf{From \biblatex~3.4.0}, you can use entry option \opt{noinherit=author} as in the following example: \begin{minted}{latex} @book{mainentry, - Author = {Name}, - … + Author = {Name}, + … } @book{subentry, Crossref = {mainentry}, - Options = {noinherit=author}, - … + Options = {noinherit=author}, + … } \end{minted} \section{Credits} @@ -101,10 +105,39 @@ \begin{changelog} -\begin{release}{2.2.1}{2015-06-06} +\begin{release}{2.6.0}{2017-01-24} + \item Add compatibility with the biblatex-morenames package. +\end{release} + +\begin{release}{2.5.0}{2016-10-23} + \item Add \verb+anonymous+manuscripts+ sorting scheme. +\end{release} + +\begin{release}{2.4.0}{2016-09-25} + \item Also works for anonymous \bibtype{inreference}, \bibtype{bookinreference} and \bibtype{bookininreference}. + \item Fix bug added by version 2.2.2 when using the \emph{biblatex-realauthor} package. +\end{release} + +\begin{release}{2.3.0}{2016-09-08} + \item Add compatibility with \bibtype{bookininbook} and \bibtype{bookininarticle} of \emph{biblatex-bookinbook} package. +\end{release} + +\begin{release}{2.2.3}{2016-06-27} + \item Fix bug added on v.~2.2.2 when using prenote argument. + \end{release} + +\begin{release}{2.2.2a}{2016-06-21} + \item Fix typo in handbook. + \end{release} + +\begin{release}{2.2.2}{2016-06-18} + \item Fix \biblatex\ bug with \expandafter\cs\expandafter{\prm{xx}cites} command when using anonymous works. + \item Fix bug added by version 2.0.0 when not using the \emph{biblatex-realauthor} package. + \end{release} +\begin{release}{2.2.1}{2016-06-06} \item Fix compatibility with biblatex < 3.4, broken by v. 2.2.0 \end{release} -\begin{release}{2.2.0}{2015-06-05} +\begin{release}{2.2.0}{2016-06-05} \item Takes account of the \bibfield{realeditor} field of the \emph{biblatex-realauthor} package~2.4.0 and later. \item Adds tools to prevent inherinting name from main entry \see{noinherit}. \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-anonymous.doc.tlpobj new/tlpkg/tlpobj/biblatex-anonymous.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-anonymous.doc.tlpobj 2016-06-07 17:33:41.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-anonymous.doc.tlpobj 2017-04-14 17:31:43.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-anonymous.doc category Package -revision 41297 +revision 43043 shortdesc doc files of biblatex-anonymous relocated 1 -docfiles size=19 +docfiles size=20 RELOC/doc/latex/biblatex-anonymous/README RELOC/doc/latex/biblatex-anonymous/biblatex-anonymous.pdf RELOC/doc/latex/biblatex-anonymous/biblatex-anonymous.tex ++++++ biblatex-anonymous.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-anonymous/biblatex-anonymous.sty new/tex/latex/biblatex-anonymous/biblatex-anonymous.sty --- old/tex/latex/biblatex-anonymous/biblatex-anonymous.sty 2016-06-07 00:57:03.000000000 +0200 +++ new/tex/latex/biblatex-anonymous/biblatex-anonymous.sty 2017-01-24 23:01:05.000000000 +0100 @@ -1,4 +1,4 @@ -%% Copyright 2014 Maïeul Rouquette +%% Copyright 2014-… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -12,20 +12,58 @@ % % The Current Maintainer of this work is Maïeul Rouquette \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-anonymous}[2016/06/06 v2.2.1 Manage anonymous works with biblatex] +\ProvidesPackage{biblatex-anonymous}[2017/01/24 v2.6.0 Manage anonymous works with biblatex] %1. Just execute bibliographic option for some entries type -\ExecuteBibliographyOptions[book, bookinbook, bookinarticle, bookinincollection, mvbook,inbook]{useeditor=false,usetranslator=false,userealeditor=false} - +\ExecuteBibliographyOptions[% + book,% + bookinbook,% + bookinarticle,% + bookincollection,% + bookinincollection,% + mvbook,% + inbook,% + bookininbook,% + bookininarticle,% + inreference,% + bookinreference,% + bookininreference% + ]{useeditor=false,usetranslator=false} +\ifdefined\etb@tgl@blx@userealeditor + \ExecuteBibliographyOptions[% + book,% + bookinbook,% + bookinarticle,% + bookincollection,% + bookinincollection,% + mvbook,% + inbook,% + bookininbook,% + bookininarticle,% + inreference,% + bookinreference,% + bookininreference% + ]{userealeditor=false} +\fi +\ifdefined\etb@tgl@blx@usebookineditor + \ExecuteBibliographyOptions[% + book,% + bookinbook,% + bookinarticle,% + bookincollection,% + bookinincollection,% + mvbook,% + inbook,% + bookininbook,% + bookininarticle,% + inreference,% + bookinreference,% + bookininreference% + ]{usebookineditor=false,useineditor=false,usemaineditor=false} +\fi % 2. Sorting -\DeclareSortingScheme{anonymous}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } +\def\bbx@anonymous@sorting{ \sort{ \field{sortname} \field{author} @@ -46,13 +84,39 @@ \literal{0000} } } +\DeclareSortingScheme{anonymous}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@anonymous@sorting +} + +\AtEndPreamble{ + \ifundef{\bbx@manuscripts@sorting}{}% + { + \DeclareSortingScheme{anonymous+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@anonymous@sorting + \bbx@manuscripts@sorting + } + } +} %%3.1 And so, prevent the spurious space in case of \cites command -%%% Not for now, waiting from https://github.com/plk/biblatex/issues/285 +%%% Hack suggested on https://github.com/plk/biblatex/issues/285#issuecomment-226918950 +\AtEveryCitekey{\iffieldundef{prenote}{\blx@initunit}{}} %4. Tools to prevent inhering author field (require biblatex > 3.4) \ifdefined\DeclareDatafieldSet - + \DeclareDatafieldSet{author}{ \member[field=author] } @@ -61,6 +125,6 @@ %5. Language specific setting \DefineBibliographyStrings{french}{% byeditor = % - {\ifuseeditor{dir\adddotspace}{éd\adddot}}, + {\ifuseeditor{dir\adddotspace}{\'ed\adddot}}, } \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-anonymous.tlpobj new/tlpkg/tlpobj/biblatex-anonymous.tlpobj --- old/tlpkg/tlpobj/biblatex-anonymous.tlpobj 2016-06-07 17:33:41.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-anonymous.tlpobj 2017-04-14 17:31:43.000000000 +0200 @@ -1,15 +1,15 @@ name biblatex-anonymous category Package -revision 41297 +revision 43043 shortdesc A tool to manage anonymous work with BibLaTeX relocated 1 longdesc The package provides tools to help manage anonymous work with -longdesc biblatex. It will be useful, for example, in history or +longdesc BibLaTeX. It will be useful, for example, in history or longdesc classical philology. runfiles size=1 RELOC/tex/latex/biblatex-anonymous/biblatex-anonymous.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-anonymous -catalogue-date 2016-06-06 19:56:56 +0200 +catalogue-date 2017-01-24 19:59:03 +0100 catalogue-license lppl1.3 catalogue-topics humanities biblatex -catalogue-version 2.2.1 +catalogue-version 2.6.0 ++++++ biblatex-apa.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-apa/README new/doc/latex/biblatex-apa/README --- old/doc/latex/biblatex-apa/README 2016-05-15 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-apa/README 2017-01-08 01:01:03.000000000 +0100 @@ -1,9 +1,9 @@ -Version 6.9 +Version 7.4 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version 1.3c (http://www.latex-project.org/lppl.txt). The current -maintainer is Philip Kime (© 2016). +maintainer is Philip Kime (© 2017). This package is a biblatex style for APA (American Psychological Association) style compliant documents typeset in LaTeX. It diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib new/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib --- old/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2016-05-15 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2017-01-08 01:01:03.000000000 +0100 @@ -2,68 +2,68 @@ @BOOK{6.11, AUTHOR = {Kessler, Jr., A.}, TITLE = {Title}, - YEAR = {2003}, + DATE = {2003}, } % (APA 6.12) @BOOK{6.12a, AUTHOR = {A. Smith and B. Jones}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } @BOOK{6.12b, AUTHOR = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } @BOOK{6.12c, AUTHOR = {A. Ireys and B. Chernoff and C. DeVet and D. Kim}, TITLE = {Title}, - YEAR = {2001}, + DATE = {2001}, } @BOOK{6.12d, AUTHOR = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver}, TITLE = {Title}, - YEAR = {2001}, + DATE = {2001}, } @BOOK{6.12e, AUTHOR = {A. Kurtines and B. Szapocznik}, TITLE = {Title}, - YEAR = {2003}, + DATE = {2003}, } @BOOK{6.12f, AUTHOR = {A. Jöreskog and B. Sörbon}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } @BOOK{6.12g, AUTHOR = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli}, TITLE = {Title}, - YEAR = {1996}, + DATE = {1996}, } @BOOK{6.12h, AUTHOR = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly}, TITLE = {Title}, - YEAR = {1996}, + DATE = {1996}, } @BOOK{6.12i, AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge}, TITLE = {Title}, - YEAR = {1990}, + DATE = {1990}, } @BOOK{6.12j, AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and E. Elide}, TITLE = {Title 2}, - YEAR = {1991}, + DATE = {1991}, } % (APA 6.13) @@ -74,64 +74,64 @@ @MISC{6.13a, AUTHOR = {A. Walker}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } @MISC{6.13b, AUTHOR = {A. Walker and B. Allen}, TITLE = {Title}, - YEAR = {2004}, + DATE = {2004}, } @MISC{6.13c, AUTHOR = {A. Bradley and B. Ramirez and C. Soo}, TITLE = {Title}, - YEAR = {1999}, + DATE = {1999}, } @MISC{6.13d, AUTHOR = {A. Bradley and B. Ramirez and C. Soo and D. Walsh}, TITLE = {Title}, - YEAR = {2006}, + DATE = {2006}, } @MISC{6.13e, AUTHOR = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo}, TITLE = {Title}, - YEAR = {2008}, + DATE = {2008}, } @MISC{6.13f, AUTHOR = {Z. Wasserstein and A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo}, TITLE = {Title}, - YEAR = {2005}, + DATE = {2005}, } @MISC{6.13g, AUTHOR = {{National Institute of Mental Health}}, SHORTAUTHOR = {NIMH}, TITLE = {Title}, - YEAR = {2003}, + DATE = {2003}, } @MISC{6.13h, AUTHOR = {{University of Pittsburgh}}, TITLE = {Title}, - YEAR = {2005}, + DATE = {2005}, } @MISC{6.13i, AUTHOR = {{The American Psychological Association}}, SHORTAUTHOR = {APA}, TITLE = {Title1}, - YEAR = {2005}, + DATE = {2005}, } @MISC{6.13j, AUTHOR = {{The American Psychological Association}}, SHORTAUTHOR = {APA}, TITLE = {Title2}, - YEAR = {2006}, + DATE = {2006}, } % (APA 6.14) @@ -139,7 +139,7 @@ AUTHOR = {I. Light}, TITLE = {Deflecting Immigration}, SUBTITLE = {Networks, Markets, and regulation in Los Angeles}, - YEAR = {2006}, + DATE = {2006}, LOCATION = {New York, NY}, PUBLISHER = {Russell Sage Foundation}, } @@ -148,43 +148,43 @@ @ARTICLE{6.15a, TITLE = {Study Finds Something Interesting}, SHORTTITLE = {Study Finds}, - YEAR = {2007}, + DATE = {2007}, } @BOOK{6.15b, TITLE = {College Bound Seniors}, - YEAR = {2008}, + DATE = {2008}, } @BOOK{6.15c, AUTHOR = {Anonymous}, TITLE = {Title}, - YEAR = {1998}, + DATE = {1998}, } % (APA 6.16) @BOOK{6.16a, AUTHOR = {{Department of Veterans Affairs}}, TITLE = {Title1}, - YEAR = {2001}, + DATE = {2001}, } @BOOK{6.16b, AUTHOR = {{Department of Veterans Affairs}}, TITLE = {Title1}, - YEAR = {2003}, + DATE = {2003}, } @BOOK{6.16c, AUTHOR = {A. Gogel}, TITLE = {Title1}, - YEAR = {1990}, + DATE = {1990}, } @BOOK{6.16d, AUTHOR = {A. Gogel}, TITLE = {Title2}, - YEAR = {2006}, + DATE = {2006}, } @BOOK{6.16e, @@ -196,13 +196,13 @@ @BOOK{6.16f, AUTHOR = {A. Derryberry and B. Reed}, TITLE = {Title1}, - YEAR = {2005}, + DATE = {2005}, } @BOOK{6.16g, AUTHOR = {A. Derryberry and B. Reed}, TITLE = {Title2}, - YEAR = {2005}, + DATE = {2005}, } @BOOK{6.16h, @@ -214,50 +214,50 @@ @BOOK{6.16i, AUTHOR = {A. Rothbart}, TITLE = {Title1}, - YEAR = {2003}, + DATE = {2003}, } @BOOK{6.16j, AUTHOR = {A. Rothbart}, TITLE = {Title2}, - YEAR = {2003}, + DATE = {2003}, } @BOOK{6.16k, AUTHOR = {A. Miller}, TITLE = {Title}, - YEAR = {1999}, + DATE = {1999}, } @BOOK{6.16l, AUTHOR = {A. Shafrankse and B. Mahoney}, TITLE = {Title}, - YEAR = {1998}, + DATE = {1998}, } @BOOK{6.16m, AUTHOR = {A. Minor}, TITLE = {Title}, - YEAR = {2001}, + DATE = {2001}, } @BOOK{6.16n, AUTHOR = {A. Adams}, TITLE = {Title}, - YEAR = {1999}, + DATE = {1999}, } @BOOK{6.16o, AUTHOR = {A. Storandt}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } % PUBSTATE is not used as there is a year - enforces by a style source map in .bbx @BOOK{6.16p, AUTHOR = {Steven Smidge}, TITLE = {Something 1}, - YEAR = {2000}, + DATE = {2000}, PUBSTATE = {inpress} } @@ -278,7 +278,7 @@ @BOOK{6.17, AUTHOR = {A. Nicholson}, TITLE = {Title}, - YEAR = {2003}, + DATE = {2003}, } % (APA 6.18) @@ -286,14 +286,14 @@ AUTHOR = {Aristotle}, TITLE = {Ethics}, TRANSLATOR = {S. Translator}, - YEAR = {1931}, + DATE = {1931}, } @BOOK{6.18b, AUTHOR = {H. James}, TITLE = {Novel}, ORIGDATE = {1890}, - YEAR = {1983}, + DATE = {1983}, } % Last two examples need no references entry @@ -302,13 +302,13 @@ @BOOK{6.19a, AUTHOR = {{Centers for Disease Control and Prevention}}, TITLE = {Title}, - YEAR = {2005}, + DATE = {2005}, } @BOOK{6.19b, AUTHOR = {A. Shimamura}, TITLE = {Title}, - YEAR = {1989}, + DATE = {1989}, } % (APA 6.20) - No examples need references entry @@ -317,7 +317,7 @@ @BOOK{6.21, AUTHOR = {{U.S. Department of Labor}}, TITLE = {Title}, - YEAR = {2007}, + DATE = {2007}, } % (APA 6.28a) @@ -330,7 +330,7 @@ @ARTICLE{7.01:3b, AUTHOR = {M. A. Light and I. H. Light}, TITLE = {The Geographic Expansion of Mexican Immigration in the United States and its Implications for Local Law Enforcement}, - YEAR = {2008}, + DATE = {2008}, JOURNALTITLE = {Law Enforcement Executive Forum Journal}, VOLUME = {8}, NUMBER = {1}, @@ -344,7 +344,7 @@ JOURNALTITLE = {Psychology, Public Policy and Law}, VOLUME = {10}, NUMBER = {4}, - YEAR = {2004} + DATE = {2004} } @PATENT{A7.07, @@ -360,7 +360,7 @@ AUTHOR = {Arthur Amorous and Brian Belligerent and Clive Clandestine}, TITLE = {Names Which Inspire Envy}, SUBTITLE = {The Fashions of Nominal Imprudence}, - YEAR = {1923}, + DATE = {1923}, JOURNALTITLE = {Journal of International Interest}, VOLUME = {87}, NUMBER = {12}, @@ -371,25 +371,25 @@ @BOOK{UL1, AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble}, TITLE = {Many Things and Other Topics}, - YEAR = {2010} + DATE = {2010} } @BOOK{UL2, AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble}, TITLE = {Random Articles Found Under Cats}, - YEAR = {2010} + DATE = {2010} } @BOOK{UL3, AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled}, TITLE = {Can You Say a Word?}, - YEAR = {2010} + DATE = {2010} } @BOOK{UL4, AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt}, TITLE = {Looking at Spiders}, - YEAR = {2010} + DATE = {2010} } % Testing "with" @@ -397,14 +397,14 @@ AUTHOR = {James Jaunty and Russell Rendition}, WITH = {Alan Also}, TITLE = {Look for Lost Limps}, - YEAR = {2000} + DATE = {2000} } % Testing citeauthor @BOOK{ca1, AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional}, TITLE = {Three Modern Men}, - YEAR = {2001} + DATE = {2001} } % Testing no date @@ -466,7 +466,7 @@ @BOOK{pretest, AUTHOR = {Luis von Mises}, TITLE = {A Title}, - YEAR = {2000} + DATE = {2000} } % Prefix test (useprefix=false) @@ -474,7 +474,7 @@ OPTIONS = {useprefix=false}, AUTHOR = {Luis von Mises}, TITLE = {Another Title}, - YEAR = {2001} + DATE = {2001} } % Prefix + suffix test (useprefix=true) first-last @@ -489,27 +489,27 @@ OPTIONS = {useprefix=false}, AUTHOR = {von Greaves, Jr., Percy L.}, TITLE = {A test of noprefix 2}, - YEAR = {2001} + DATE = {2001} } % Prefix + suffix test (useprefix=true) @BOOK{presufftest2, AUTHOR = {von Greaves, Jr., Percy L.}, TITLE = {A test of noprefix 2}, - YEAR = {2001} + DATE = {2001} } % Oxford comma tests @BOOK{oc1, AUTHOR = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles}, TITLE = {Laughter Through the Ages}, - YEAR = {1987} + DATE = {1987} } @BOOK{oc2, AUTHOR = {Miserable, Markus and Doleful, Derek and Bitter, Brian}, TITLE = {Dictionary of Depressions}, - YEAR = {1987} + DATE = {1987} } % Test "and others" @@ -523,7 +523,7 @@ VOLUME = {76}, NUMBER = {2}, PAGES = {306--317}, - YEAR = {2011} + DATE = {2011} } @ARTICLE{ao2, @@ -538,27 +538,27 @@ JOURNAL = {Jolly Journal}, ISSUE = {Spring}, PAGES = {100--103}, - YEAR = {2001} + DATE = {2001} } % Testing name initials as per: http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-t… @BOOK{first, AUTHOR = {Brown, Y. and Campbell, W. K.}, - YEAR = {2004} + DATE = {2004} } @BOOK{second, AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.}, - YEAR = {1993} + DATE = {1993} } @BOOK{third, AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.}, - YEAR = {2005} + DATE = {2005} } @BOOK{fourth, AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.}, - YEAR = {1992} + DATE = {1992} } @ARTICLE{deutsch1963, @@ -568,24 +568,56 @@ VOLUME = {70}, NUMBER = {1}, PAGES = {1--10}, - YEAR = {1963}, + DATE = {1963}, } % Testing multicite name elision -@article{kingetal2005a, - author = {King, J. E. and Weiss, A. and Farmer, K. H.}, - title = {Title}, - year = {2005} -} - -@article{weissetal2007a, - author = {Weiss, A. and King, J. E. and Hopkins, W. D.}, - title = {Title}, - year = {2007} -} - -@article{weissetal2009a, - author = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.}, - title = {Title}, - year = {2009} +@ARTICLE{kingetal2005a, + AUTHOR = {King, J. E. and Weiss, A. and Farmer, K. H.}, + TITLE = {Title}, + DATE = {2005} +} + +@ARTICLE{weissetal2007a, + AUTHOR = {Weiss, A. and King, J. E. and Hopkins, W. D.}, + TITLE = {Title}, + DATE = {2007} +} + +@ARTICLE{weissetal2009a, + AUTHOR = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.}, + TITLE = {Title}, + DATE = {2009} +} + +% Testing era output +@BOOK{plato, + AUTHOR = {Plato}, + TITLE = {Meno}, + DATE = {-0379?~} } + +% Testing citation with complete dates +@ARTICLE{Ludwig2014, + AUTHOR = {Ludwig, Jan}, + TITLE = {Wenn nichts mehr geht}, + URL = {http://www.zeit.de/campus/2014/06/pruefungsergebnis-klage}, + JOURNALTITLE = {Zeit Campus}, + DATE = {2014-10-08}, + LANGUAGE = {de} +} + +% Testing date range with same months, different days +@BOOK{daterange1, + AUTHOR = {Freddy Furnishings}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-01/1984-02-27}, +} + +% Testing date range with different months +@BOOK{daterange2, + AUTHOR = {Graham Granary}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-27/1984-03-01}, +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-apa/biblatex-apa-test-references.bib new/doc/latex/biblatex-apa/biblatex-apa-test-references.bib --- old/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2013-07-12 01:24:58.000000000 +0200 +++ new/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2017-01-08 01:01:03.000000000 +0100 @@ -6,7 +6,7 @@ JOURNALTITLE = {Health Psychology}, VOLUME = {24}, PAGES = {225--229}, - YEAR = {2005}, + DATE = {2005}, DOI = {10.1037/0278-6133.24.2.225}, URL = {http://some.url} @@ -19,7 +19,7 @@ JOURNALTITLE = {Nicotine and Tobacco Research}, VOLUME = {6}, PAGES = {249--267}, - YEAR = {2004}, + DATE = {2004}, DOI = {10.1080/14622200410001676305} } @@ -31,14 +31,14 @@ VOLUME = {2}, NUMBER = {2}, PAGES = {38--48}, - YEAR = {2006}, + DATE = {2006}, URL = {http://ojs.lib.swin.edu.au/index.php/ejap} } @ARTICLE{7.01:3b, AUTHOR = {M. A. Light and I. H. Light}, TITLE = {The Geographic Expansion of {M}exican Immigration in the {U}nited {S}tates and its Implications for Local Law Enforcement}, - YEAR = {2008}, + DATE = {2008}, JOURNALTITLE = {Law Enforcement Executive Forum Journal}, VOLUME = {8}, NUMBER = {1}, @@ -53,7 +53,7 @@ JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant}, VOLUME = {19}, PAGES = {5--17}, - YEAR = {2007}, + DATE = {2007}, } % (APA 7.01 Example 5) @@ -63,7 +63,7 @@ AUTHOR = {S. C. {Von Ledebur}}, TITLE = {Optimizing Knowledge Transfer by New Employees in Companies}, JOURNALTITLE = {Knowledge Management Research and Practice}, - YEAR = {2007}, + DATE = {2007}, NOTE = {Advance online publication}, DOI = {10.1057/palgrave.kmrp.8500141} } @@ -146,7 +146,7 @@ JOURNALTITLE = {Psychology, Public Policy and Law}, VOLUME = {10}, NUMBER = {4}, - YEAR = {2004} + DATE = {2004} } @ARTICLE{7.01:12b, @@ -156,7 +156,7 @@ JOURNALTITLE = {Developmental Psychology}, VOLUME = {42}, PAGES = {391--458}, - YEAR = {2006} + DATE = {2006} } % APA manual implicit example made explicit - no editors @@ -167,7 +167,7 @@ JOURNALTITLE = {Psychology, Public Policy and Law}, VOLUME = {10}, NUMBER = {4}, - YEAR = {2004} + DATE = {2004} } % (APA 7.01 Example 13) @@ -179,7 +179,7 @@ JOURNALTITLE = {Journal of Applied Psychology}, VOLUME = {76}, PAGES = {143--168}, - YEAR = {1991}, + DATE = {1991}, DOI = {10.1037/0021-9010.76.1.143} } @@ -190,7 +190,7 @@ JOURNALTITLE = {Monographs of the Society for Research in Child Development}, VOLUME = {58}, NUMBER = {1, Serial No. 231}, - YEAR = {1993} + DATE = {1993} } % Implicit example made explicit (Given in APA 5th Ed. Manual) @@ -201,7 +201,7 @@ JOURNALTITLE = {Journal of Experimental Psychology Monographs}, VOLUME = {80}, NUMBER = {3, Pt. 2}, - YEAR = {1969} + DATE = {1969} } % (APA 7.01 Example 14) @@ -211,7 +211,7 @@ JOURNALTITLE = {Journal of Contingencies and Crisis Management}, VOLUME = {14}, PAGES = {1--2}, - YEAR = {2006} + DATE = {2006} } % (APA 7.01 Example 15) @@ -223,7 +223,7 @@ JOURNALTITLE = {Journal of Comparitive Psychology}, VOLUME = {122}, PAGES = {186--194}, - YEAR = {2008}, + DATE = {2008}, DOI = {10.1037/0735-7036.122.2.186.supp} } @@ -235,7 +235,7 @@ JOURNALTITLE = {Society for Neuroscience Abstracts}, VOLUME = {17}, PAGES = {480}, - YEAR = {1991} + DATE = {1991} } % Note use of ABSTRACTURL field value to specify that the URL is for the abstract @@ -246,7 +246,7 @@ JOURNALTITLE = {Psychology in the Schools}, VOLUME = {43}, PAGES = {701--712}, - YEAR = {2006}, + DATE = {2006}, ABSTRACTURL = {http://www.interscience.wiley.com} } @@ -260,7 +260,7 @@ JOURNALTITLE = {Small Group Research}, VOLUME = {31}, PAGES = {24--53}, - YEAR = {2000}, + DATE = {2000}, ABSTRACTLOC = {{S}ociological {A}bstracts database. (Accession No. 200010185)} } @@ -270,7 +270,7 @@ TITLE = {Computer Addiction? A Study of Computer Dependency}, LOCATION = {London, England}, PUBLISHER = {Taylor \& Francis}, - YEAR = {1989} + DATE = {1989} } % (APA 7.02 Example 19) @@ -281,7 +281,7 @@ AUTHOR = {M. A. Shotton}, TITLE = {Computer Addiction? A Study of Computer Dependency}, TITLEADDON = {{DX} {R}eader version}, - YEAR = {1990}, + DATE = {1990}, URL = {http://www.ebbokstore.tandf.co.uk/html/index.asp} } @@ -290,7 +290,7 @@ TITLE = {The Post-traumatic Stress Disorder Sourcebook}, SUBTITLE = {A Guide to Healing, Recovery, and Growth}, TITLEADDON = {{A}dobe {D}igital {E}ditions version}, - YEAR = {2001}, + DATE = {2001}, DOI = {10.1036/0071393722} } @@ -374,7 +374,7 @@ PAGES = {3--18}, LOCATION = {Hillsdale, NJ}, PUBLISHER = {Erlbaum}, - YEAR = {1988}, + DATE = {1988}, RELATED = {mcppiaget}, RELATEDTYPE = {reprintfrom} } @@ -394,7 +394,7 @@ TITLE = {{APA} Dictionary of Psychology}, LOCATION = {Washington, DC}, PUBLISHER = {American Psychological Association}, - YEAR = {2007}, + DATE = {2007}, } % (APA 7.02 Example 28) @@ -405,7 +405,7 @@ EDITION = {22}, LOCATION = {Madrid, Spain}, PUBLISHER = {Author}, - YEAR = {2001}, + DATE = {2001}, } % (APA 7.02 Example 29) @@ -418,7 +418,7 @@ TITLE = {Behaviourism}, BOOKTITLE = {The {S}tanford Encyclopedia of Philosophy}, EDITION = {Fall 2007 ed.}, - YEAR = {2005}, + DATE = {2005}, URL = {http://plato.stanford.edu/entries/behaviourism/} } @@ -439,7 +439,7 @@ SUBTITLE = {A Guide for Schools}, TYPE = {NIH Publication}, NUMBER = {02-2650}, - YEAR = {2003}, + DATE = {2003}, URL = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf} } @@ -447,7 +447,7 @@ @REPORT{7.03:32, AUTHOR = {{American Psychological Association, Task Force on the Sexualization of Girls}}, TITLE = {Report of the {APA} {T}ask {F}orce on the {S}exualization of {G}irls}, - YEAR = {2007}, + DATE = {2007}, URL = {http://www.apa.org/pi/wpo/sexualization.html} } @@ -459,7 +459,7 @@ TITLE = {The Contribution of Microfinance Institutions to Poverty Reduction in {T}anzania}, TYPE = {Research Report}, NUMBER = {06.3}, - YEAR = {2006}, + DATE = {2006}, URLDESCRIPTION = {Poverty Alleviation website}, URL = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf} } @@ -473,7 +473,7 @@ SUBTITLE = {Influence and Domination in the Reading Policymaking Environment}, TYPE = {CIERA Report}, NUMBER = {3-025}, - YEAR = {2002}, + DATE = {2002}, URLDESCRIPTION = {University of Michigan, Center for Improvement of Early Reading Achievement website}, URL = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf} } @@ -520,7 +520,7 @@ BOOKTITLE = {Proceedings of the {N}ational {A}cademy of {S}ciences, {USA}}, VOLUME = {105}, PAGES = {12593--12598}, - YEAR = {2008}, + DATE = {2008}, DOI = {10.1073/pnas.0805417105} } @@ -546,7 +546,7 @@ AUTHOR = {D. S. McNiel}, TITLE = {Meaning Through Narrative}, SUBTITLE = {A Personal Narrative Discussing Growing Up with an Alchoholic Mother}, - YEAR = {2006}, + DATE = {2006}, NOTE = {Available from ProQuest Dissertations and Theses database}, ADDENDUM = {UMI No. 1434728} } @@ -555,7 +555,7 @@ @PHDTHESIS{7.05:41, AUTHOR = {R. J. Adams}, TITLE = {Building a Foundation for Evaluation of Instruction in Higher Education and Continuing Education}, - YEAR = {1973}, + DATE = {1973}, URL = {http://www.ohiolink.edu/etd/} } @@ -565,7 +565,7 @@ TITLE = {{MOOSE} Crossing}, SUBTITLE = {Construction, Community, and Learning in a Networked Virtual World for Kids}, INSTITUTION = {Massachusetts Institute of Technology}, - YEAR = {1977}, + DATE = {1977}, URL = {http://www-static.cc.gatech.edu/~asb/thesis/} } @@ -578,7 +578,7 @@ SUBTITLE = {Texture Amplification, Motion Representation, and Figure-Ground Segregation}, VOLUME = {65}, NUMBER = {10}, - YEAR = {2005}, + DATE = {2005}, PAGES = {5428} } @@ -592,7 +592,7 @@ TYPE = {Doctoral thesis}, INSTITUTION = {Royal Institute of Technology, Stockholm}, LOCATION = {Sweden}, - YEAR = {2000}, + DATE = {2000}, URL = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029} } @@ -657,7 +657,7 @@ ENTRYSUBTYPE = {Computer Game}, TITLE = {BioShock}, DATE = {2007} - } +} % (APA 7.06 Example 48) @REVIEW{7.06:48, @@ -677,7 +677,7 @@ VOLUME = {2}, NUMBER = {1}, PAGES = {1--10}, - YEAR = {2003}, + DATE = {2003}, } % (APA 7.07 Example 49) @@ -687,7 +687,7 @@ ENTRYSUBTYPE = {{DVD}}, PRODUCER = {{American Psychological Association}}, TITLE = {Responding Therapeutically to Patient Expressions of Sexual Attraction}, - YEAR = {2000}, + DATE = {2000}, URL = {http://www.apa.org/videos/} } @@ -724,7 +724,7 @@ MAINTITLEADDON = {{CD}}, LOCATION = {New York, NY}, PUBLISHER = {Nonesuch Records}, - YEAR = {2008}, + DATE = {2008}, } % (APA 7.07 Example 53) @@ -733,7 +733,7 @@ NAMEADDON = {Cartographer}, TITLE = {Population Density, 2000 {U}.{S}. {C}ensus}, ENTRYSUBTYPE = {Demographic map}, - YEAR = {2002}, + DATE = {2002}, URL = {http://www.co.lewis.wa.us/publicworks/maps/Demographics/census-pop-dens_2000.pdf} } @@ -743,7 +743,7 @@ AUTHOR = {{Pew Hispanic Center}}, TITLE = {Changing Channels and Crisscrossing Cultures}, SUBTITLE = {A Survey of {L}atinos on the News Media}, - YEAR = {2004}, + DATE = {2004}, URL = {http://pewhispanic.org/datasets/} } @@ -753,7 +753,7 @@ TITLE = {{E-SOFTA}}, SUBTITLE = {System for Observing Family Therapy Alliances}, ENTRYSUBTYPE = {Software and training videos}, - YEAR = {2002}, + DATE = {2002}, NOTE = {Unpublished instrument}, URL = {http://www.softa-soatif.com/} } @@ -773,7 +773,7 @@ ENTRYSUBTYPE = {Apparatus and software}, LOCATION = {Mississauga, Ontario, Canada}, PUBLISHER = {SR Research}, - YEAR = {2004}, + DATE = {2004}, } % (APA 7.09 Example 58) @@ -783,7 +783,7 @@ HOWPUBLISHED = {Unpublished manuscript}, INSTITUTION = {Department of Psychology, University of British Columbia}, LOCATION = {Vancouver, Canada}, - YEAR = {2003}, + DATE = {2003}, } % (APA 7.09 Example 59) @@ -792,7 +792,7 @@ TITLE = {Mental Health Help-Seeking in Ethnic Minority Populations}, SUBTITLE = {A Theoretical Perspective}, HOWPUBLISHED = {Manuscript submitted for publication}, - YEAR = {2008}, + DATE = {2008}, } % (APA 7.09 Example 60) @@ -800,14 +800,14 @@ AUTHOR = {F. Bordi and J. E. LeDoux}, ENTRYSUBTYPE = {Auditory Response Latencies in Rat Auditory Cortex}, NOTE = {Unpublished raw data}, - YEAR = {1993}, + DATE = {1993}, } % (APA 7.09 Example 61) @UNPUBLISHED{7.09:61a, AUTHOR = {S. D. Mitchell}, TITLE = {The Import of Uncertainty}, - YEAR = {2000}, + DATE = {2000}, URL = {http://philsci-archive.pitt.edu/archive/00000162/} } @@ -818,7 +818,7 @@ VOLUME = {2}, NUMBER = {1}, PAGES = {58--71}, - YEAR = {2007}, + DATE = {2007}, } % (APA 7.09 Example 62) @@ -828,7 +828,7 @@ AUTHOR = {K. Kubota}, TITLE = {``{S}oaking'' Model for Learning}, SUBTITLE = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective}, - YEAR = {2007}, + DATE = {2007}, EPRINTTYPE = {eric}, EPRINT = {ED498566} } @@ -866,20 +866,19 @@ @UNPUBLISHED{7.10:66, AUTHOR = {A. Berliner}, TITLE = {Notes for a Lecture on Reminiscences of {W}undt and {L}epizig}, - YEAR = {1959}, + DATE = {1959}, HOWPUBLISHED = {Anna Berliner Memoirs (Box M50)}, LOCATION = {{Archives of the History of American Psychology, University of Akron, Akron}, OH} } % (APA 7.10 Example 67) -% Pseudo-boolean fields "DOUBTFULAUTHOR" and "DOUBTFULDATE" to specify doubtful information -% to the drivers. Values should only ever be "true" if present. +% biblatex 3.4+ supports data annotations which can be use to deal with uncertain authors +% biblatex 3.5+ supports uncertainty marker for dates @UNPUBLISHED{7.10:67, - DOUBTFULAUTHOR = {true}, - DOUBTFULDATE = {true}, AUTHOR = {A. Allport}, + AUTHOR+an = {=uncertain}, TITLE = {Marion {T}aylor Today---By the Biographer}, - YEAR = {1937}, + DATE = {1937~}, HOWPUBLISHED = {Unpublished manuscript, Marion Taylor Papers}, LOCATION = {{Schlesinger Library, Radcliffe College, Cambridge}, MA} } @@ -935,17 +934,16 @@ } % (APA 7.10 Example 73) -% Use DOUBTFULDATE to specifiy the "known" status of the DATE (see Example 67) +% biblatex 3.5+ supports EDTF circa markers in dates % Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual % with example 7.10:67. They differ in that 7.10:67 has brackets around the approximate % date and 7.10:73 has parenthesis. I have chosen brackets for consistency. % Use TITLEISDESCRIPTION to indicate a title that is really a description and not a real % title @MISC{7.10:73, - DOUBTFULDATE = {true}, TITLEISDESCRIPTION = {true}, TITLE = {{Photographs of Robert M. Yerkes}}, - DATE = {1917/1954}, + DATE = {1917~/1954}, HOWPUBLISHED = {Robert Mearns Yerkes Papers (Box 137, Folder 2292)}, LOCATION = {{Manuscripts and Archives, Yale University Library, New Haven}, CT} } @@ -963,7 +961,7 @@ @ONLINE{7.11:75, ENTRYSUBTYPE = {Electronic mailing list message}, AUTHOR = {S. Smith}, - TITLE = {Re: {D}isputed Estimates of {IQ}}, + TITLE = {Re: Disputed Estimates of {IQ}}, DATE = {2006-01-05}, URL = {http://tech.groups.yahoo.com/group/ForensicNetwork/message/670}, } @@ -1004,6 +1002,8 @@ } % APA 6th doesn't have any extended date format examples. +% Also test order of inpress and nodate, see +% http://blog.apastyle.org/apastyle/2013/01/alphabetizing-in-press-and-no-dat… @ONLINE{habitat1, TITLE = {Mission, Vision \& Values}, URL = {http://www.tchabitat.org/missionvisionvalues}, @@ -1027,6 +1027,14 @@ URLDATE = {2012} } +@ONLINE{habitat4, + TITLE = {Mission, Vision \& Values}, + PUBSTATE = {inpress}, + URL = {http://www.tchabitat.org/missionvisionvalues}, + ORGANIZATION = {Twin Cities Habitat for Humanity website}, + URLDATE = {2011-09-15} +} + @INPROCEEDINGS{proc1, AUTHOR = {Anon, A. N.}, TITLE = {A very interesting paper}, Binary files old/doc/latex/biblatex-apa/biblatex-apa-test.pdf and new/doc/latex/biblatex-apa/biblatex-apa-test.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-apa/biblatex-apa-test.tex new/doc/latex/biblatex-apa/biblatex-apa-test.tex --- old/doc/latex/biblatex-apa/biblatex-apa-test.tex 2016-05-15 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-apa/biblatex-apa-test.tex 2017-01-08 01:01:03.000000000 +0100 @@ -22,7 +22,7 @@ % document but since we are generating the citations from a real data % source, we have to prevent the usual uniquelist processing by making % all of the examples MISC entrytypes and changing uniquelist -% per-type. There is no point in just typsetting static data as this +% per-type. There is no point in just typesetting static data as this % wouldn't be a test of anything. \ExecuteBibliographyOptions[misc]{uniquelist=false} \DeclareNameFormat[misc]{labelname}{% @@ -64,32 +64,26 @@ \makeatletter % This solution to detokenize leaving a space after the command and % arguments is due to Bruno Le Floch on T.SE -\long\def\apaexi#1% - {% - \catcode64=11 - \begingroup - % Ensure that every character is preserved by \lowercase. - \count@\z@ - \loop\ifnum\count@<256 - \lccode\count@\z@ - \advance\count@\@ne - \repeat - % Except spaces, changed to ^^A - \lccode32=\@ne - \lowercase - {% - \endgroup - \expandafter\test@\detokenize{#1}\relax% - \catcode64=12 - }% - } +\long\def\apaexi#1{% + \catcode64=11 + \begingroup + % Ensure that every character is preserved by \lowercase. + \count@\z@ + \loop\ifnum\count@<256 + \lccode\count@\z@ + \advance\count@\@ne + \repeat + % Except spaces, changed to ^^A + \lccode32=\@ne + \lowercase{% + \endgroup + \expandafter\test@\detokenize{#1}\relax% + \catcode64=12}} % Then map {^^A => space, space =>} onto the string. -\def\test@#1% - {% - \ifx#1\relax\test@end\fi - \ifnum`#1=\@ne\space\else#1\fi - \test@ - } +\def\test@#1{% + \ifx#1\relax\test@end\fi + \ifnum`#1=\@ne\space\else#1\fi + \test@} \def\test@end\fi#1\test@{\fi} \def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}} @@ -313,7 +307,7 @@ automated processing and specifying an anomalous infix format. It would be better and probably acceptable for it to be:}\\ \apaex{\parencite[][trans.]{6.18a}}\\\\ -Entries with an |ORIGYEAR| field will automatically use it:\\ +Entries with an |ORIGDATE| field will automatically use it:\\ \apaex{\textcite{6.18b}}\\\\ The other examples of standard classical texts in this section should just be typed by hand--there is little benefit to automating these examples and @@ -434,6 +428,19 @@ % truncation of the 2007 and 2009 names is the same \noindent{Testing name elision in cites}\\ \apaex{\parencite{kingetal2005a,weissetal2007a,weissetal2009a}} + +\noindent Testing circa/BCE/uncertain era format\\ +\apaex{\nptextcite{plato}} + +\noindent Testing citation formats for complete dates\\ +\apaex{\textcite{Ludwig2014}} + +\noindent Testing month ranges with same months, different days\\ +\apaex{\textcite{daterange1}} + +\noindent Testing month ranges with different months\\ +\apaex{\textcite{daterange2}} + \end{refsection} \begin{refsection}[../bibtex/bib/biblatex-apa-test-references] \nocite{*} Binary files old/doc/latex/biblatex-apa/biblatex-apa.pdf and new/doc/latex/biblatex-apa/biblatex-apa.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-apa/biblatex-apa.tex new/doc/latex/biblatex-apa/biblatex-apa.tex --- old/doc/latex/biblatex-apa/biblatex-apa.tex 2016-05-15 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-apa/biblatex-apa.tex 2017-01-08 01:01:03.000000000 +0100 @@ -21,15 +21,15 @@ \titlepage{% title={APA Bib\LaTeX\ style}, subtitle={Citation and References macros for Bib\LaTeX}, - url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/bi…, + url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-ap…, author={Philip Kime}, email={Philip(a)kime.org.uk}, - revision={6.9}, + revision={7.4}, date={\today}} \hypersetup{% pdftitle={APA Bib\LaTeX\ style}, - pdfsubject={APA Citation and References macros for Bib\LaTeX}, + pdfsubject={APA 6 Conformant Style for Bib\LaTeX}, pdfauthor={Philip Kime}, pdfkeywords={latex, biblatex, APA, style}} @@ -44,6 +44,19 @@ version. This section is just for important things like incompatible changes which users should be aware of. +\minisec{7.1} +This version requires |biblatex| $>=$3.6 and |biber| $>=$2.6. + +\minisec{7.0} +This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6. Uncertain, +approximate and era-marked dates are now supported in the |biblatex| core +and therefore special fields are no longer needed in the style. See example +files, in particular \texttt{7.10:67} entry in the references test +\file{.bib} and the \texttt{plato} entry in the citation test \file{.bib}. + +\minisec{7.0} +This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6. + \minisec{6.9} This version requires |biblatex| $>=$3.4 and |biber| $>=$2.5. @@ -167,6 +180,7 @@ for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian localisation. Thanks to Sebastian Ørsted for the Danish localisation. +Thanks to Jürgen Spitzmüller for the DGPs localisation hints. \section{Use}\label{ref:use} \label{use} @@ -300,6 +314,10 @@ for german, ngerman and french. You should redefine the |\mkbibdatelong| macro in the relevant language |*-apa.lbx| file to change this if needed. +A customisable macro \cmd{urldatecomma} determines what comes between the +date of a URL and the URL itself. This defaults to the standard comma and +space as per APA style but just a space in germanic localisations. + \subsection{Limitations} \label{use:limit} There are certain limitations you need to bear in mind when using these @@ -308,7 +326,7 @@ look and the implicit assumption is that you would type out everything by hand if necessary. Having said that, the majority of the APA citation and references style is implemented, there are just a few exceptions which -are hardly worth the coding pain since they ambiguous and easily worked +are hardly worth the coding pain since they are ambiguous and easily worked around. \section{Details} @@ -437,6 +455,30 @@ \begin{changelog} +\begin{release}{7.4}{2017-01-06} +\item Minor bugfix release +\end{release} + +\begin{release}{7.3}{2016-12-21} +\item Minor bugfix release +\end{release} + +\begin{release}{7.2}{2016-10-24} +\item Minor bugfix release for date fields +\end{release} + +\begin{release}{7.1}{2016-09-15} +\item Minor bugfix release for legacy YEAR fields and |inpress| strings +\item Requires |biblatex| 3.6+ and biber 2.6+ +\end{release} + +\begin{release}{7.0}{2016-09-14} +\item Added \cmd{urldatacomma} +\item Now following DGPs guidelines for some formatting in Germanic + locales. +\item Requires |biblatex| 3.5+ and biber 2.6+ +\end{release} + \begin{release}{6.9}{2016-05-13} \item Bug fixes \item Requires |biblatex| 3.4+ and biber 2.5+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-apa.doc.tlpobj new/tlpkg/tlpobj/biblatex-apa.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-apa.doc.tlpobj 2016-05-15 03:18:05.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-apa.doc.tlpobj 2017-04-14 17:31:43.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-apa.doc category Package -revision 41125 +revision 42893 shortdesc doc files of biblatex-apa relocated 1 docfiles size=77 ++++++ biblatex-apa.tar.xz ++++++ ++++ 1869 lines of diff (skipped) ++++++ biblatex-bookinarticle.doc.tar.xz ++++++ ++++++ biblatex-bookinarticle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bookinarticle.tlpobj new/tlpkg/tlpobj/biblatex-bookinarticle.tlpobj --- old/tlpkg/tlpobj/biblatex-bookinarticle.tlpobj 2016-04-14 18:42:09.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-bookinarticle.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-bookinarticle -catalogue-date 2016-04-07 17:36:52 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics humanities biblatex catalogue-version 1.3.1a ++++++ biblatex-bookinother.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf and new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex --- old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex 2017-03-27 23:41:40.000000000 +0200 @@ -9,7 +9,7 @@ \usepackage{shortvrb} \usepackage{pifont} \usepackage{minted} -\usepackage{graphics} +\usepackage{graphicx} % Usefull commands \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} \newcommand{\pkg}[1]{\emph{#1}} @@ -24,8 +24,8 @@ subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.0.0a}, - date={16/04/2016}, + revision={2.3.0}, + date={27/03/2017}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex @@ -38,6 +38,8 @@ \addbibresource{example-bookinjournal.bib} \addbibresource{example-bookinproceedings.bib} \addbibresource{example-bookinthesis.bib} +\addbibresource{example-bookininbook.bib} +\addbibresource{example-bookininarticle.bib} \begin{document} \printtitlepage @@ -72,10 +74,15 @@ \item Inheritance's mechanism for these entry types. \item Integration of the entry types following the standard bibliography's styles of biblatex. \item Integration of the new fields of the \pkg{biblatex-morenames} package. + \item New fields when required and not defined in \pkg{biblatex-morenames} package. \end{itemize} \section{Loading package} + +The package requires \emph{biblatex} 3.4 or later. + + As the package defines new fields, you must load it as a \verb+bibstyle+ option of \biblatex package. \begin{minted}{latex} @@ -121,7 +128,7 @@ Here is a list of fields which are NOT inherited : \begin{itemize} \item \bibfield{author} means the author of the edited (ancient) book. - \item \bibfield{bookineditor} means the editor of the edited (ancient) book. + \item \bibfield{bookineditor} means the editor of the edited (ancient) book. If this field is equal to the \bibfield{editor} field, the last one is not printed. \item \bibfield{title} means the title of the edited (ancient) book. \item \bibfield{subtitle} means the subtitle of the edited (ancient) book. @@ -129,8 +136,12 @@ If you use the \bibfield{ineditor} field of the \pkg{biblatex-morenames} package, it will be inherited as \bibfield{bookeditor} field. -Notes that the package take account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. +Note that the package takes account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. +Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. +Use the \pkg{biblatex-morenames} package to add this field to the style of \bibtype{bookinbook}. + + % Here, a loop on the entry type, to automatically generate the handbook \def\firstofthree#1#2#3{#1} @@ -140,7 +151,7 @@ \edef\entrytype{\firstofthree#1}% \edef\entrykey{\secondofthree#1}% \edef\entrymore{\thirdofthree#1}% - \subsection{\bibtype{bookin\entrytype}} + \newpage\subsection{\bibtype{bookin\entrytype}} \subsubsection{Meaning} For book edited in a \bibtype{\entrytype} entry. \subsubsection{.bib example} @@ -174,6 +185,8 @@ This is a more specific variant of \bibtype{bookincollection}. The standard styles will treat this entry type as an alias for \bibtype{bookincollection}. }}},% + {{inarticle}{Cohn1891_txt}{}},% + {{inbook}{Laudo}{\unexpanded{We use the \emph{biblatex-anonymous} package to manage the anonymous entry here.}}}, {{incollection}{AcTiteLatin}{% \unexpanded{\subsubsection{About \bibtype{bookininreference}} The package also provides a \bibtype{bookininreference} entry type for book edited in a \bibtype{inreference}. @@ -197,7 +210,7 @@ \item \bibtype{bookinmathesis} for book edited in a \bibtype{mathesis}; \item \bibtype{bookinphdthesis} for book edited in a \bibtype{phdthesis}. \end{itemize} - }}}% + }}},% } \section{Customization} @@ -208,6 +221,32 @@ \begin{changelog} +\begin{release}{2.3.0}{2016-03-27} + \item Improve compatibility with \emph{biblatex-opcit-booktitle} package for \cs{inarticle} and related entrytypes. +\end{release} + +\begin{release}{2.2.1}{2016-02-08} + \item Use `title' bibmacro and not directly the field in \bibtype{ininbook} driver. +\end{release} + +\begin{release}{2.2.0}{2016-09-08} + \item Add compatibility with \emph{biblatex-opcit-booktitle} package's mechanism. + \item Add \bibtype{bookininarticle} and \bibtype{ininarticle} entrytypes. + \item Add \bibtype{bookininbook} and \bibtype{ininbook} entrytypes. + \item Use \cs{printdelim}\verb+{nametitledelim}+ instead of directly calling \cs{labelnamepunct}. + \item Don't define again \verb+bybookineditor+ macro if already defined by \emph{biblatex-morenames}. + \item Fix bug with inheritance of \bibfield{titleaddon} and related field. + \item If the \bibfield{bookineditor} or \bibfield{ineditor} field is equal to the\bibfield{editor} field, the last one is not printed. +\end{release} + +\begin{release}{2.1.1}{2016-06-16} + \item Use \cs{DeclareStyleSourceMap} instead of \cs{DeclareSourceMap}. +\end{release} + +\begin{release}{2.1.0}{2016-06-06} + \item Add message to make more detectable breaking compatibility with new release of biblatex. +\end{release} + \begin{release}{2.0.0a}{2016-04-16} \item Fix typo. \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot 2016-11-25 19:28:14.000000000 +0100 @@ -45,12 +45,12 @@ - "section0/VanDeun1990/title" -> "section0/BHG226e/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINTITLE inherited via CROSSREF from VanDeun1990/TITLE" ] - "section0/VanDeun1990/ineditor" -> "section0/BHG226e/bookeditor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKEDITOR inherited via CROSSREF from VanDeun1990/INEDITOR" ] - "section0/VanDeun1990/year" -> "section0/BHG226e/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/YEAR inherited via CROSSREF from VanDeun1990/YEAR" ] "section0/VanDeun1990/author" -> "section0/BHG226e/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKAUTHOR inherited via CROSSREF from VanDeun1990/AUTHOR" ] - "section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ] + "section0/VanDeun1990/ineditor" -> "section0/BHG226e/bookeditor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKEDITOR inherited via CROSSREF from VanDeun1990/INEDITOR" ] "section0/VanDeun1990/journaltitle" -> "section0/BHG226e/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/JOURNALTITLE inherited via CROSSREF from VanDeun1990/JOURNALTITLE" ] + "section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ] "section0/VanDeun1990/subtitle" -> "section0/BHG226e/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINSUBTITLE inherited via CROSSREF from VanDeun1990/SUBTITLE" ] + "section0/VanDeun1990/title" -> "section0/BHG226e/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINTITLE inherited via CROSSREF from VanDeun1990/TITLE" ] + "section0/VanDeun1990/year" -> "section0/BHG226e/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/YEAR inherited via CROSSREF from VanDeun1990/YEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookincollection.dot new/doc/latex/biblatex-bookinother/documentation/example-bookincollection.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookincollection.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookincollection.dot 2016-11-25 19:28:14.000000000 +0100 @@ -53,16 +53,16 @@ - "section0/Doe2016/eventmonth" -> "section0/Aristotle2016/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTMONTH inherited via CROSSREF from Doe2016/EVENTMONTH" ] - "section0/Doe2016/eventendyear" -> "section0/Aristotle2016/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTENDYEAR inherited via CROSSREF from Doe2016/EVENTENDYEAR" ] + "section0/Doe2016/editor" -> "section0/Aristotle2016/editor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EDITOR inherited via CROSSREF from Doe2016/EDITOR" ] + "section0/Doe2016/eventday" -> "section0/Aristotle2016/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTDAY inherited via CROSSREF from Doe2016/EVENTDAY" ] + "section0/Doe2016/eventendday" -> "section0/Aristotle2016/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTENDDAY inherited via CROSSREF from Doe2016/EVENTENDDAY" ] "section0/Doe2016/eventendmonth" -> "section0/Aristotle2016/eventendmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTENDMONTH inherited via CROSSREF from Doe2016/EVENTENDMONTH" ] + "section0/Doe2016/eventendyear" -> "section0/Aristotle2016/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTENDYEAR inherited via CROSSREF from Doe2016/EVENTENDYEAR" ] + "section0/Doe2016/eventmonth" -> "section0/Aristotle2016/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTMONTH inherited via CROSSREF from Doe2016/EVENTMONTH" ] + "section0/Doe2016/eventyear" -> "section0/Aristotle2016/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTYEAR inherited via CROSSREF from Doe2016/EVENTYEAR" ] "section0/Doe2016/location" -> "section0/Aristotle2016/location" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/LOCATION inherited via CROSSREF from Doe2016/LOCATION" ] + "section0/Doe2016/publisher" -> "section0/Aristotle2016/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/PUBLISHER inherited via CROSSREF from Doe2016/PUBLISHER" ] "section0/Doe2016/title" -> "section0/Aristotle2016/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/BOOKTITLE inherited via CROSSREF from Doe2016/TITLE" ] - "section0/Doe2016/eventday" -> "section0/Aristotle2016/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTDAY inherited via CROSSREF from Doe2016/EVENTDAY" ] - "section0/Doe2016/editor" -> "section0/Aristotle2016/editor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EDITOR inherited via CROSSREF from Doe2016/EDITOR" ] "section0/Doe2016/year" -> "section0/Aristotle2016/year" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/YEAR inherited via CROSSREF from Doe2016/YEAR" ] - "section0/Doe2016/publisher" -> "section0/Aristotle2016/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/PUBLISHER inherited via CROSSREF from Doe2016/PUBLISHER" ] - "section0/Doe2016/eventendday" -> "section0/Aristotle2016/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTENDDAY inherited via CROSSREF from Doe2016/EVENTENDDAY" ] - "section0/Doe2016/eventyear" -> "section0/Aristotle2016/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2016/EVENTYEAR inherited via CROSSREF from Doe2016/EVENTYEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib --- old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib 2016-11-25 19:28:14.000000000 +0100 @@ -0,0 +1,25 @@ +@article{Crusius1891, + Author={Otto Crusius and Leopold Cohn}, + Date={1891/1893}, + Journaltitle={Philologus}, + Journalsubtitle={Zeitschrift für das classische Altertum}, + Number={6}, + Pages={201-324}, + Series={Supplementband}, + Title={Zur handschriftlichen Uberlieferung, Kritik und Quellenkunde der Paroemiographen} +} + +@inarticle{Cohn1891, + Author={Leopold Cohn}, + Crossref={Crusius1891}, + Pages={224-267}, + Title={Zur Ueberlieferung des alphabetischen Corpus} +} + +@bookininarticle{Cohn1891_txt, + Crossref={Cohn1891}, + Pages={238-253}, + Title={Collectio~proverbiorum~cod.~Vat.~gr.~306}, + Subtitle={cum recensione D2 fere concinens} +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot 2016-11-25 19:28:14.000000000 +0100 @@ -0,0 +1,91 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/Cohn1891" { + fontsize="10"; + label="Cohn1891 (INARTICLE)"; + tooltip="Cohn1891 (INARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Cohn1891/author" [ label="AUTHOR" ] + "section0/Cohn1891/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Cohn1891/crossref" [ label="CROSSREF" ] + "section0/Cohn1891/endyear" [ label="ENDYEAR" ] + "section0/Cohn1891/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Cohn1891/journaltitle" [ label="JOURNALTITLE" ] + "section0/Cohn1891/maintitle" [ label="MAINTITLE" ] + "section0/Cohn1891/number" [ label="NUMBER" ] + "section0/Cohn1891/pages" [ label="PAGES" ] + "section0/Cohn1891/series" [ label="SERIES" ] + "section0/Cohn1891/title" [ label="TITLE" ] + "section0/Cohn1891/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Cohn1891_txt" { + fontsize="10"; + label="Cohn1891_txt (BOOKININARTICLE)"; + tooltip="Cohn1891_txt (BOOKININARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Cohn1891_txt/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Cohn1891_txt/booktitle" [ label="BOOKTITLE" ] + "section0/Cohn1891_txt/crossref" [ label="CROSSREF" ] + "section0/Cohn1891_txt/endyear" [ label="ENDYEAR" ] + "section0/Cohn1891_txt/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Cohn1891_txt/journaltitle" [ label="JOURNALTITLE" ] + "section0/Cohn1891_txt/mainauthor" [ label="MAINAUTHOR" ] + "section0/Cohn1891_txt/maintitle" [ label="MAINTITLE" ] + "section0/Cohn1891_txt/number" [ label="NUMBER" ] + "section0/Cohn1891_txt/pages" [ label="PAGES" ] + "section0/Cohn1891_txt/series" [ label="SERIES" ] + "section0/Cohn1891_txt/subtitle" [ label="SUBTITLE" ] + "section0/Cohn1891_txt/title" [ label="TITLE" ] + "section0/Cohn1891_txt/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Crusius1891" { + fontsize="10"; + label="Crusius1891 (ARTICLE)"; + tooltip="Crusius1891 (ARTICLE)"; + fillcolor="#a0d0ff"; + + "section0/Crusius1891/author" [ label="AUTHOR" ] + "section0/Crusius1891/endyear" [ label="ENDYEAR" ] + "section0/Crusius1891/journalsubtitle" [ label="JOURNALSUBTITLE" ] + "section0/Crusius1891/journaltitle" [ label="JOURNALTITLE" ] + "section0/Crusius1891/number" [ label="NUMBER" ] + "section0/Crusius1891/pages" [ label="PAGES" ] + "section0/Crusius1891/series" [ label="SERIES" ] + "section0/Crusius1891/title" [ label="TITLE" ] + "section0/Crusius1891/year" [ label="YEAR" ] + } + + + + "section0/Cohn1891/author" -> "section0/Cohn1891_txt/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/BOOKAUTHOR inherited via CROSSREF from Cohn1891/AUTHOR" ] + "section0/Cohn1891/bookauthor" -> "section0/Cohn1891_txt/mainauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/MAINAUTHOR inherited via CROSSREF from Cohn1891/BOOKAUTHOR" ] + "section0/Cohn1891/endyear" -> "section0/Cohn1891_txt/endyear" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/ENDYEAR inherited via CROSSREF from Cohn1891/ENDYEAR" ] + "section0/Cohn1891/journalsubtitle" -> "section0/Cohn1891_txt/journalsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/JOURNALSUBTITLE inherited via CROSSREF from Cohn1891/JOURNALSUBTITLE" ] + "section0/Cohn1891/journaltitle" -> "section0/Cohn1891_txt/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/JOURNALTITLE inherited via CROSSREF from Cohn1891/JOURNALTITLE" ] + "section0/Cohn1891/maintitle" -> "section0/Cohn1891_txt/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/MAINTITLE inherited via CROSSREF from Cohn1891/MAINTITLE" ] + "section0/Cohn1891/number" -> "section0/Cohn1891_txt/number" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/NUMBER inherited via CROSSREF from Cohn1891/NUMBER" ] + "section0/Cohn1891/series" -> "section0/Cohn1891_txt/series" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/SERIES inherited via CROSSREF from Cohn1891/SERIES" ] + "section0/Cohn1891/title" -> "section0/Cohn1891_txt/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/BOOKTITLE inherited via CROSSREF from Cohn1891/TITLE" ] + "section0/Cohn1891/year" -> "section0/Cohn1891_txt/year" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891_txt/YEAR inherited via CROSSREF from Cohn1891/YEAR" ] + "section0/Crusius1891/author" -> "section0/Cohn1891/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/BOOKAUTHOR inherited via CROSSREF from Crusius1891/AUTHOR" ] + "section0/Crusius1891/endyear" -> "section0/Cohn1891/endyear" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/ENDYEAR inherited via CROSSREF from Crusius1891/ENDYEAR" ] + "section0/Crusius1891/journalsubtitle" -> "section0/Cohn1891/journalsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/JOURNALSUBTITLE inherited via CROSSREF from Crusius1891/JOURNALSUBTITLE" ] + "section0/Crusius1891/journaltitle" -> "section0/Cohn1891/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/JOURNALTITLE inherited via CROSSREF from Crusius1891/JOURNALTITLE" ] + "section0/Crusius1891/number" -> "section0/Cohn1891/number" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/NUMBER inherited via CROSSREF from Crusius1891/NUMBER" ] + "section0/Crusius1891/series" -> "section0/Cohn1891/series" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/SERIES inherited via CROSSREF from Crusius1891/SERIES" ] + "section0/Crusius1891/title" -> "section0/Cohn1891/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/MAINTITLE inherited via CROSSREF from Crusius1891/TITLE" ] + "section0/Crusius1891/year" -> "section0/Cohn1891/year" [ penwidth="2.0", color="#7d7879", tooltip="Cohn1891/YEAR inherited via CROSSREF from Crusius1891/YEAR" ] + +} Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib --- old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib 2016-11-25 19:28:14.000000000 +0100 @@ -0,0 +1,22 @@ +@Book{Duebner1878, + author = {Dübner, F. and Bussemaker, U. Cats}, + title = {Scholia in Theocritum, Nicandrum et Oppianum}, + location = {Parisiis}, + publisher = {Editore Ambrosio Firmin--Didot}, + year = {1878}, +} + +@Inbook{Bussemaker1878, + author = {Bussemaker, U. Cats}, + title = {Scholia et Paraphrases in Nicandrum et Oppianum}, + pages = {243--364}, + crossref = {Duebner1878}, + titleaddon = {Partim nunc primum edidit, partim collatis cod. mss. emendavit, annotatione critica instruxit et indices confecit}, +} + +@Bookininbook{ScholiainOppianum1878, + author = {{Scholia~in~Oppianum}}, + title = {In Halieutica}, + pages = {260--364}, + crossref = {Bussemaker1878}, +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot 2016-11-25 19:28:14.000000000 +0100 @@ -0,0 +1,78 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/Bussemaker1878" { + fontsize="10"; + label="Bussemaker1878 (INBOOK)"; + tooltip="Bussemaker1878 (INBOOK)"; + fillcolor="#a0d0ff"; + + "section0/Bussemaker1878/author" [ label="AUTHOR" ] + "section0/Bussemaker1878/bookauthor" [ label="BOOKAUTHOR" ] + "section0/Bussemaker1878/booktitle" [ label="BOOKTITLE" ] + "section0/Bussemaker1878/crossref" [ label="CROSSREF" ] + "section0/Bussemaker1878/location" [ label="LOCATION" ] + "section0/Bussemaker1878/pages" [ label="PAGES" ] + "section0/Bussemaker1878/publisher" [ label="PUBLISHER" ] + "section0/Bussemaker1878/title" [ label="TITLE" ] + "section0/Bussemaker1878/titleaddon" [ label="TITLEADDON" ] + "section0/Bussemaker1878/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Duebner1878" { + fontsize="10"; + label="Duebner1878 (BOOK)"; + tooltip="Duebner1878 (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/Duebner1878/author" [ label="AUTHOR" ] + "section0/Duebner1878/location" [ label="LOCATION" ] + "section0/Duebner1878/publisher" [ label="PUBLISHER" ] + "section0/Duebner1878/title" [ label="TITLE" ] + "section0/Duebner1878/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/ScholiainOppianum1878" { + fontsize="10"; + label="ScholiainOppianum1878 (BOOKININBOOK)"; + tooltip="ScholiainOppianum1878 (BOOKININBOOK)"; + fillcolor="#a0d0ff"; + + "section0/ScholiainOppianum1878/author" [ label="AUTHOR" ] + "section0/ScholiainOppianum1878/bookauthor" [ label="BOOKAUTHOR" ] + "section0/ScholiainOppianum1878/booktitle" [ label="BOOKTITLE" ] + "section0/ScholiainOppianum1878/booktitleaddon" [ label="BOOKTITLEADDON" ] + "section0/ScholiainOppianum1878/crossref" [ label="CROSSREF" ] + "section0/ScholiainOppianum1878/location" [ label="LOCATION" ] + "section0/ScholiainOppianum1878/mainauthor" [ label="MAINAUTHOR" ] + "section0/ScholiainOppianum1878/maintitle" [ label="MAINTITLE" ] + "section0/ScholiainOppianum1878/pages" [ label="PAGES" ] + "section0/ScholiainOppianum1878/publisher" [ label="PUBLISHER" ] + "section0/ScholiainOppianum1878/title" [ label="TITLE" ] + "section0/ScholiainOppianum1878/year" [ label="YEAR" ] + } + + + + "section0/Bussemaker1878/author" -> "section0/ScholiainOppianum1878/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKAUTHOR inherited via CROSSREF from Bussemaker1878/AUTHOR" ] + "section0/Bussemaker1878/bookauthor" -> "section0/ScholiainOppianum1878/mainauthor" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/MAINAUTHOR inherited via CROSSREF from Bussemaker1878/BOOKAUTHOR" ] + "section0/Bussemaker1878/booktitle" -> "section0/ScholiainOppianum1878/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/MAINTITLE inherited via CROSSREF from Bussemaker1878/BOOKTITLE" ] + "section0/Bussemaker1878/location" -> "section0/ScholiainOppianum1878/location" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/LOCATION inherited via CROSSREF from Bussemaker1878/LOCATION" ] + "section0/Bussemaker1878/publisher" -> "section0/ScholiainOppianum1878/publisher" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/PUBLISHER inherited via CROSSREF from Bussemaker1878/PUBLISHER" ] + "section0/Bussemaker1878/title" -> "section0/ScholiainOppianum1878/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKTITLE inherited via CROSSREF from Bussemaker1878/TITLE" ] + "section0/Bussemaker1878/titleaddon" -> "section0/ScholiainOppianum1878/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/BOOKTITLEADDON inherited via CROSSREF from Bussemaker1878/TITLEADDON" ] + "section0/Bussemaker1878/year" -> "section0/ScholiainOppianum1878/year" [ penwidth="2.0", color="#7d7879", tooltip="ScholiainOppianum1878/YEAR inherited via CROSSREF from Bussemaker1878/YEAR" ] + "section0/Duebner1878/author" -> "section0/Bussemaker1878/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/BOOKAUTHOR inherited via CROSSREF from Duebner1878/AUTHOR" ] + "section0/Duebner1878/location" -> "section0/Bussemaker1878/location" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/LOCATION inherited via CROSSREF from Duebner1878/LOCATION" ] + "section0/Duebner1878/publisher" -> "section0/Bussemaker1878/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/PUBLISHER inherited via CROSSREF from Duebner1878/PUBLISHER" ] + "section0/Duebner1878/title" -> "section0/Bussemaker1878/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/BOOKTITLE inherited via CROSSREF from Duebner1878/TITLE" ] + "section0/Duebner1878/year" -> "section0/Bussemaker1878/year" [ penwidth="2.0", color="#7d7879", tooltip="Bussemaker1878/YEAR inherited via CROSSREF from Duebner1878/YEAR" ] + +} Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.dot new/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.dot 2016-11-25 19:28:14.000000000 +0100 @@ -28,20 +28,6 @@ "section0/AcTiteLatin/year" [ label="YEAR" ] } - subgraph "cluster_section0/Griggio2008" { - fontsize="10"; - label="Griggio2008 (COLLECTION)"; - tooltip="Griggio2008 (COLLECTION)"; - fillcolor="#a0d0ff"; - - "section0/Griggio2008/editor" [ label="EDITOR" ] - "section0/Griggio2008/location" [ label="LOCATION" ] - "section0/Griggio2008/publisher" [ label="PUBLISHER" ] - "section0/Griggio2008/subtitle" [ label="SUBTITLE" ] - "section0/Griggio2008/title" [ label="TITLE" ] - "section0/Griggio2008/year" [ label="YEAR" ] - } - subgraph "cluster_section0/Chiesa2008" { fontsize="10"; label="Chiesa2008 (INCOLLECTION)"; @@ -60,21 +46,35 @@ "section0/Chiesa2008/year" [ label="YEAR" ] } + subgraph "cluster_section0/Griggio2008" { + fontsize="10"; + label="Griggio2008 (COLLECTION)"; + tooltip="Griggio2008 (COLLECTION)"; + fillcolor="#a0d0ff"; + + "section0/Griggio2008/editor" [ label="EDITOR" ] + "section0/Griggio2008/location" [ label="LOCATION" ] + "section0/Griggio2008/publisher" [ label="PUBLISHER" ] + "section0/Griggio2008/subtitle" [ label="SUBTITLE" ] + "section0/Griggio2008/title" [ label="TITLE" ] + "section0/Griggio2008/year" [ label="YEAR" ] + } + - "section0/Griggio2008/subtitle" -> "section0/Chiesa2008/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKSUBTITLE inherited via CROSSREF from Griggio2008/SUBTITLE" ] - "section0/Griggio2008/publisher" -> "section0/Chiesa2008/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/PUBLISHER inherited via CROSSREF from Griggio2008/PUBLISHER" ] - "section0/Griggio2008/location" -> "section0/Chiesa2008/location" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/LOCATION inherited via CROSSREF from Griggio2008/LOCATION" ] - "section0/Griggio2008/title" -> "section0/Chiesa2008/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKTITLE inherited via CROSSREF from Griggio2008/TITLE" ] - "section0/Griggio2008/editor" -> "section0/Chiesa2008/editor" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/EDITOR inherited via CROSSREF from Griggio2008/EDITOR" ] - "section0/Griggio2008/year" -> "section0/Chiesa2008/year" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/YEAR inherited via CROSSREF from Griggio2008/YEAR" ] - "section0/Chiesa2008/booktitle" -> "section0/AcTiteLatin/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINTITLE inherited via CROSSREF from Chiesa2008/BOOKTITLE" ] - "section0/Chiesa2008/year" -> "section0/AcTiteLatin/year" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/YEAR inherited via CROSSREF from Chiesa2008/YEAR" ] - "section0/Chiesa2008/editor" -> "section0/AcTiteLatin/editor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/EDITOR inherited via CROSSREF from Chiesa2008/EDITOR" ] "section0/Chiesa2008/author" -> "section0/AcTiteLatin/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKAUTHOR inherited via CROSSREF from Chiesa2008/AUTHOR" ] "section0/Chiesa2008/booksubtitle" -> "section0/AcTiteLatin/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINSUBTITLE inherited via CROSSREF from Chiesa2008/BOOKSUBTITLE" ] - "section0/Chiesa2008/publisher" -> "section0/AcTiteLatin/publisher" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/PUBLISHER inherited via CROSSREF from Chiesa2008/PUBLISHER" ] + "section0/Chiesa2008/booktitle" -> "section0/AcTiteLatin/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINTITLE inherited via CROSSREF from Chiesa2008/BOOKTITLE" ] + "section0/Chiesa2008/editor" -> "section0/AcTiteLatin/editor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/EDITOR inherited via CROSSREF from Chiesa2008/EDITOR" ] "section0/Chiesa2008/location" -> "section0/AcTiteLatin/location" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/LOCATION inherited via CROSSREF from Chiesa2008/LOCATION" ] + "section0/Chiesa2008/publisher" -> "section0/AcTiteLatin/publisher" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/PUBLISHER inherited via CROSSREF from Chiesa2008/PUBLISHER" ] "section0/Chiesa2008/title" -> "section0/AcTiteLatin/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKTITLE inherited via CROSSREF from Chiesa2008/TITLE" ] + "section0/Chiesa2008/year" -> "section0/AcTiteLatin/year" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/YEAR inherited via CROSSREF from Chiesa2008/YEAR" ] + "section0/Griggio2008/editor" -> "section0/Chiesa2008/editor" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/EDITOR inherited via CROSSREF from Griggio2008/EDITOR" ] + "section0/Griggio2008/location" -> "section0/Chiesa2008/location" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/LOCATION inherited via CROSSREF from Griggio2008/LOCATION" ] + "section0/Griggio2008/publisher" -> "section0/Chiesa2008/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/PUBLISHER inherited via CROSSREF from Griggio2008/PUBLISHER" ] + "section0/Griggio2008/subtitle" -> "section0/Chiesa2008/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKSUBTITLE inherited via CROSSREF from Griggio2008/SUBTITLE" ] + "section0/Griggio2008/title" -> "section0/Chiesa2008/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKTITLE inherited via CROSSREF from Griggio2008/TITLE" ] + "section0/Griggio2008/year" -> "section0/Chiesa2008/year" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/YEAR inherited via CROSSREF from Griggio2008/YEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.dot new/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.dot 2016-11-25 19:28:14.000000000 +0100 @@ -8,34 +8,6 @@ style=filled, shape=box ]; - subgraph "cluster_section0/Onyme2012" { - fontsize="10"; - label="Onyme2012 (INPROCEEDINGS)"; - tooltip="Onyme2012 (INPROCEEDINGS)"; - fillcolor="#a0d0ff"; - - "section0/Onyme2012/author" [ label="AUTHOR" ] - "section0/Onyme2012/booksubtitle" [ label="BOOKSUBTITLE" ] - "section0/Onyme2012/booktitle" [ label="BOOKTITLE" ] - "section0/Onyme2012/booktitleaddon" [ label="BOOKTITLEADDON" ] - "section0/Onyme2012/crossref" [ label="CROSSREF" ] - "section0/Onyme2012/editor" [ label="EDITOR" ] - "section0/Onyme2012/eventday" [ label="EVENTDAY" ] - "section0/Onyme2012/eventendday" [ label="EVENTENDDAY" ] - "section0/Onyme2012/eventendmonth" [ label="EVENTENDMONTH" ] - "section0/Onyme2012/eventendyear" [ label="EVENTENDYEAR" ] - "section0/Onyme2012/eventmonth" [ label="EVENTMONTH" ] - "section0/Onyme2012/eventyear" [ label="EVENTYEAR" ] - "section0/Onyme2012/location" [ label="LOCATION" ] - "section0/Onyme2012/number" [ label="NUMBER" ] - "section0/Onyme2012/pages" [ label="PAGES" ] - "section0/Onyme2012/publisher" [ label="PUBLISHER" ] - "section0/Onyme2012/series" [ label="SERIES" ] - "section0/Onyme2012/title" [ label="TITLE" ] - "section0/Onyme2012/venue" [ label="VENUE" ] - "section0/Onyme2012/year" [ label="YEAR" ] - } - subgraph "cluster_section0/Aristotle2012" { fontsize="10"; label="Aristotle2012 (BOOKININPROCEEDINGS)"; @@ -91,41 +63,69 @@ "section0/Doe2012/year" [ label="YEAR" ] } + subgraph "cluster_section0/Onyme2012" { + fontsize="10"; + label="Onyme2012 (INPROCEEDINGS)"; + tooltip="Onyme2012 (INPROCEEDINGS)"; + fillcolor="#a0d0ff"; + + "section0/Onyme2012/author" [ label="AUTHOR" ] + "section0/Onyme2012/booksubtitle" [ label="BOOKSUBTITLE" ] + "section0/Onyme2012/booktitle" [ label="BOOKTITLE" ] + "section0/Onyme2012/booktitleaddon" [ label="BOOKTITLEADDON" ] + "section0/Onyme2012/crossref" [ label="CROSSREF" ] + "section0/Onyme2012/editor" [ label="EDITOR" ] + "section0/Onyme2012/eventday" [ label="EVENTDAY" ] + "section0/Onyme2012/eventendday" [ label="EVENTENDDAY" ] + "section0/Onyme2012/eventendmonth" [ label="EVENTENDMONTH" ] + "section0/Onyme2012/eventendyear" [ label="EVENTENDYEAR" ] + "section0/Onyme2012/eventmonth" [ label="EVENTMONTH" ] + "section0/Onyme2012/eventyear" [ label="EVENTYEAR" ] + "section0/Onyme2012/location" [ label="LOCATION" ] + "section0/Onyme2012/number" [ label="NUMBER" ] + "section0/Onyme2012/pages" [ label="PAGES" ] + "section0/Onyme2012/publisher" [ label="PUBLISHER" ] + "section0/Onyme2012/series" [ label="SERIES" ] + "section0/Onyme2012/title" [ label="TITLE" ] + "section0/Onyme2012/venue" [ label="VENUE" ] + "section0/Onyme2012/year" [ label="YEAR" ] + } + - "section0/Doe2012/location" -> "section0/Onyme2012/location" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/LOCATION inherited via CROSSREF from Doe2012/LOCATION" ] - "section0/Doe2012/eventyear" -> "section0/Onyme2012/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTYEAR inherited via CROSSREF from Doe2012/EVENTYEAR" ] - "section0/Doe2012/series" -> "section0/Onyme2012/series" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/SERIES inherited via CROSSREF from Doe2012/SERIES" ] - "section0/Doe2012/eventendyear" -> "section0/Onyme2012/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTENDYEAR inherited via CROSSREF from Doe2012/EVENTENDYEAR" ] - "section0/Doe2012/eventendday" -> "section0/Onyme2012/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTENDDAY inherited via CROSSREF from Doe2012/EVENTENDDAY" ] - "section0/Doe2012/eventmonth" -> "section0/Onyme2012/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTMONTH inherited via CROSSREF from Doe2012/EVENTMONTH" ] "section0/Doe2012/editor" -> "section0/Onyme2012/editor" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EDITOR inherited via CROSSREF from Doe2012/EDITOR" ] + "section0/Doe2012/eventday" -> "section0/Onyme2012/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTDAY inherited via CROSSREF from Doe2012/EVENTDAY" ] + "section0/Doe2012/eventendday" -> "section0/Onyme2012/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTENDDAY inherited via CROSSREF from Doe2012/EVENTENDDAY" ] "section0/Doe2012/eventendmonth" -> "section0/Onyme2012/eventendmonth" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTENDMONTH inherited via CROSSREF from Doe2012/EVENTENDMONTH" ] + "section0/Doe2012/eventendyear" -> "section0/Onyme2012/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTENDYEAR inherited via CROSSREF from Doe2012/EVENTENDYEAR" ] + "section0/Doe2012/eventmonth" -> "section0/Onyme2012/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTMONTH inherited via CROSSREF from Doe2012/EVENTMONTH" ] + "section0/Doe2012/eventyear" -> "section0/Onyme2012/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTYEAR inherited via CROSSREF from Doe2012/EVENTYEAR" ] + "section0/Doe2012/location" -> "section0/Onyme2012/location" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/LOCATION inherited via CROSSREF from Doe2012/LOCATION" ] "section0/Doe2012/number" -> "section0/Onyme2012/number" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/NUMBER inherited via CROSSREF from Doe2012/NUMBER" ] - "section0/Doe2012/eventday" -> "section0/Onyme2012/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/EVENTDAY inherited via CROSSREF from Doe2012/EVENTDAY" ] - "section0/Doe2012/year" -> "section0/Onyme2012/year" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/YEAR inherited via CROSSREF from Doe2012/YEAR" ] - "section0/Doe2012/subtitle" -> "section0/Onyme2012/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/BOOKSUBTITLE inherited via CROSSREF from Doe2012/SUBTITLE" ] - "section0/Doe2012/venue" -> "section0/Onyme2012/venue" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/VENUE inherited via CROSSREF from Doe2012/VENUE" ] - "section0/Doe2012/titleaddon" -> "section0/Onyme2012/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/BOOKTITLEADDON inherited via CROSSREF from Doe2012/TITLEADDON" ] "section0/Doe2012/publisher" -> "section0/Onyme2012/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/PUBLISHER inherited via CROSSREF from Doe2012/PUBLISHER" ] + "section0/Doe2012/series" -> "section0/Onyme2012/series" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/SERIES inherited via CROSSREF from Doe2012/SERIES" ] + "section0/Doe2012/subtitle" -> "section0/Onyme2012/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/BOOKSUBTITLE inherited via CROSSREF from Doe2012/SUBTITLE" ] "section0/Doe2012/title" -> "section0/Onyme2012/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/BOOKTITLE inherited via CROSSREF from Doe2012/TITLE" ] - "section0/Onyme2012/eventendday" -> "section0/Aristotle2012/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTENDDAY inherited via CROSSREF from Onyme2012/EVENTENDDAY" ] - "section0/Onyme2012/eventyear" -> "section0/Aristotle2012/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTYEAR inherited via CROSSREF from Onyme2012/EVENTYEAR" ] + "section0/Doe2012/titleaddon" -> "section0/Onyme2012/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/BOOKTITLEADDON inherited via CROSSREF from Doe2012/TITLEADDON" ] + "section0/Doe2012/venue" -> "section0/Onyme2012/venue" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/VENUE inherited via CROSSREF from Doe2012/VENUE" ] + "section0/Doe2012/year" -> "section0/Onyme2012/year" [ penwidth="2.0", color="#7d7879", tooltip="Onyme2012/YEAR inherited via CROSSREF from Doe2012/YEAR" ] + "section0/Onyme2012/author" -> "section0/Aristotle2012/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/BOOKAUTHOR inherited via CROSSREF from Onyme2012/AUTHOR" ] + "section0/Onyme2012/booksubtitle" -> "section0/Aristotle2012/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/MAINSUBTITLE inherited via CROSSREF from Onyme2012/BOOKSUBTITLE" ] + "section0/Onyme2012/booktitle" -> "section0/Aristotle2012/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/MAINTITLE inherited via CROSSREF from Onyme2012/BOOKTITLE" ] "section0/Onyme2012/booktitleaddon" -> "section0/Aristotle2012/maintitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/MAINTITLEADDON inherited via CROSSREF from Onyme2012/BOOKTITLEADDON" ] - "section0/Onyme2012/eventendyear" -> "section0/Aristotle2012/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTENDYEAR inherited via CROSSREF from Onyme2012/EVENTENDYEAR" ] - "section0/Onyme2012/series" -> "section0/Aristotle2012/series" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/SERIES inherited via CROSSREF from Onyme2012/SERIES" ] - "section0/Onyme2012/location" -> "section0/Aristotle2012/location" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/LOCATION inherited via CROSSREF from Onyme2012/LOCATION" ] + "section0/Onyme2012/editor" -> "section0/Aristotle2012/editor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EDITOR inherited via CROSSREF from Onyme2012/EDITOR" ] + "section0/Onyme2012/eventday" -> "section0/Aristotle2012/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTDAY inherited via CROSSREF from Onyme2012/EVENTDAY" ] + "section0/Onyme2012/eventendday" -> "section0/Aristotle2012/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTENDDAY inherited via CROSSREF from Onyme2012/EVENTENDDAY" ] "section0/Onyme2012/eventendmonth" -> "section0/Aristotle2012/eventendmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTENDMONTH inherited via CROSSREF from Onyme2012/EVENTENDMONTH" ] + "section0/Onyme2012/eventendyear" -> "section0/Aristotle2012/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTENDYEAR inherited via CROSSREF from Onyme2012/EVENTENDYEAR" ] "section0/Onyme2012/eventmonth" -> "section0/Aristotle2012/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTMONTH inherited via CROSSREF from Onyme2012/EVENTMONTH" ] - "section0/Onyme2012/editor" -> "section0/Aristotle2012/editor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EDITOR inherited via CROSSREF from Onyme2012/EDITOR" ] - "section0/Onyme2012/venue" -> "section0/Aristotle2012/venue" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/VENUE inherited via CROSSREF from Onyme2012/VENUE" ] - "section0/Onyme2012/year" -> "section0/Aristotle2012/year" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/YEAR inherited via CROSSREF from Onyme2012/YEAR" ] + "section0/Onyme2012/eventyear" -> "section0/Aristotle2012/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTYEAR inherited via CROSSREF from Onyme2012/EVENTYEAR" ] + "section0/Onyme2012/location" -> "section0/Aristotle2012/location" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/LOCATION inherited via CROSSREF from Onyme2012/LOCATION" ] "section0/Onyme2012/number" -> "section0/Aristotle2012/number" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/NUMBER inherited via CROSSREF from Onyme2012/NUMBER" ] - "section0/Onyme2012/eventday" -> "section0/Aristotle2012/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/EVENTDAY inherited via CROSSREF from Onyme2012/EVENTDAY" ] - "section0/Onyme2012/booksubtitle" -> "section0/Aristotle2012/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/MAINSUBTITLE inherited via CROSSREF from Onyme2012/BOOKSUBTITLE" ] "section0/Onyme2012/publisher" -> "section0/Aristotle2012/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/PUBLISHER inherited via CROSSREF from Onyme2012/PUBLISHER" ] - "section0/Onyme2012/author" -> "section0/Aristotle2012/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/BOOKAUTHOR inherited via CROSSREF from Onyme2012/AUTHOR" ] + "section0/Onyme2012/series" -> "section0/Aristotle2012/series" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/SERIES inherited via CROSSREF from Onyme2012/SERIES" ] "section0/Onyme2012/title" -> "section0/Aristotle2012/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/BOOKTITLE inherited via CROSSREF from Onyme2012/TITLE" ] - "section0/Onyme2012/booktitle" -> "section0/Aristotle2012/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/MAINTITLE inherited via CROSSREF from Onyme2012/BOOKTITLE" ] + "section0/Onyme2012/venue" -> "section0/Aristotle2012/venue" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/VENUE inherited via CROSSREF from Onyme2012/VENUE" ] + "section0/Onyme2012/year" -> "section0/Aristotle2012/year" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2012/YEAR inherited via CROSSREF from Onyme2012/YEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf differ Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.dot new/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.dot 2016-11-25 19:28:14.000000000 +0100 @@ -8,30 +8,6 @@ style=filled, shape=box ]; - subgraph "cluster_section0/Doe2015" { - fontsize="10"; - label="Doe2015 (PROCEEDINGS)"; - tooltip="Doe2015 (PROCEEDINGS)"; - fillcolor="#a0d0ff"; - - "section0/Doe2015/editor" [ label="EDITOR" ] - "section0/Doe2015/eventday" [ label="EVENTDAY" ] - "section0/Doe2015/eventendday" [ label="EVENTENDDAY" ] - "section0/Doe2015/eventendmonth" [ label="EVENTENDMONTH" ] - "section0/Doe2015/eventendyear" [ label="EVENTENDYEAR" ] - "section0/Doe2015/eventmonth" [ label="EVENTMONTH" ] - "section0/Doe2015/eventyear" [ label="EVENTYEAR" ] - "section0/Doe2015/location" [ label="LOCATION" ] - "section0/Doe2015/number" [ label="NUMBER" ] - "section0/Doe2015/publisher" [ label="PUBLISHER" ] - "section0/Doe2015/series" [ label="SERIES" ] - "section0/Doe2015/subtitle" [ label="SUBTITLE" ] - "section0/Doe2015/title" [ label="TITLE" ] - "section0/Doe2015/titleaddon" [ label="TITLEADDON" ] - "section0/Doe2015/venue" [ label="VENUE" ] - "section0/Doe2015/year" [ label="YEAR" ] - } - subgraph "cluster_section0/Aristotle2015" { fontsize="10"; label="Aristotle2015 (BOOKINPROCEEDINGS)"; @@ -61,23 +37,47 @@ "section0/Aristotle2015/year" [ label="YEAR" ] } + subgraph "cluster_section0/Doe2015" { + fontsize="10"; + label="Doe2015 (PROCEEDINGS)"; + tooltip="Doe2015 (PROCEEDINGS)"; + fillcolor="#a0d0ff"; + + "section0/Doe2015/editor" [ label="EDITOR" ] + "section0/Doe2015/eventday" [ label="EVENTDAY" ] + "section0/Doe2015/eventendday" [ label="EVENTENDDAY" ] + "section0/Doe2015/eventendmonth" [ label="EVENTENDMONTH" ] + "section0/Doe2015/eventendyear" [ label="EVENTENDYEAR" ] + "section0/Doe2015/eventmonth" [ label="EVENTMONTH" ] + "section0/Doe2015/eventyear" [ label="EVENTYEAR" ] + "section0/Doe2015/location" [ label="LOCATION" ] + "section0/Doe2015/number" [ label="NUMBER" ] + "section0/Doe2015/publisher" [ label="PUBLISHER" ] + "section0/Doe2015/series" [ label="SERIES" ] + "section0/Doe2015/subtitle" [ label="SUBTITLE" ] + "section0/Doe2015/title" [ label="TITLE" ] + "section0/Doe2015/titleaddon" [ label="TITLEADDON" ] + "section0/Doe2015/venue" [ label="VENUE" ] + "section0/Doe2015/year" [ label="YEAR" ] + } + - "section0/Doe2015/location" -> "section0/Aristotle2015/location" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/LOCATION inherited via CROSSREF from Doe2015/LOCATION" ] - "section0/Doe2015/year" -> "section0/Aristotle2015/year" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/YEAR inherited via CROSSREF from Doe2015/YEAR" ] - "section0/Doe2015/title" -> "section0/Aristotle2015/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/BOOKTITLE inherited via CROSSREF from Doe2015/TITLE" ] "section0/Doe2015/editor" -> "section0/Aristotle2015/editor" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EDITOR inherited via CROSSREF from Doe2015/EDITOR" ] - "section0/Doe2015/publisher" -> "section0/Aristotle2015/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/PUBLISHER inherited via CROSSREF from Doe2015/PUBLISHER" ] - "section0/Doe2015/number" -> "section0/Aristotle2015/number" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/NUMBER inherited via CROSSREF from Doe2015/NUMBER" ] + "section0/Doe2015/eventday" -> "section0/Aristotle2015/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTDAY inherited via CROSSREF from Doe2015/EVENTDAY" ] "section0/Doe2015/eventendday" -> "section0/Aristotle2015/eventendday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTENDDAY inherited via CROSSREF from Doe2015/EVENTENDDAY" ] - "section0/Doe2015/eventyear" -> "section0/Aristotle2015/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTYEAR inherited via CROSSREF from Doe2015/EVENTYEAR" ] - "section0/Doe2015/series" -> "section0/Aristotle2015/series" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/SERIES inherited via CROSSREF from Doe2015/SERIES" ] - "section0/Doe2015/venue" -> "section0/Aristotle2015/venue" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/VENUE inherited via CROSSREF from Doe2015/VENUE" ] - "section0/Doe2015/titleaddon" -> "section0/Aristotle2015/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/BOOKTITLEADDON inherited via CROSSREF from Doe2015/TITLEADDON" ] "section0/Doe2015/eventendmonth" -> "section0/Aristotle2015/eventendmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTENDMONTH inherited via CROSSREF from Doe2015/EVENTENDMONTH" ] "section0/Doe2015/eventendyear" -> "section0/Aristotle2015/eventendyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTENDYEAR inherited via CROSSREF from Doe2015/EVENTENDYEAR" ] "section0/Doe2015/eventmonth" -> "section0/Aristotle2015/eventmonth" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTMONTH inherited via CROSSREF from Doe2015/EVENTMONTH" ] - "section0/Doe2015/eventday" -> "section0/Aristotle2015/eventday" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTDAY inherited via CROSSREF from Doe2015/EVENTDAY" ] + "section0/Doe2015/eventyear" -> "section0/Aristotle2015/eventyear" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/EVENTYEAR inherited via CROSSREF from Doe2015/EVENTYEAR" ] + "section0/Doe2015/location" -> "section0/Aristotle2015/location" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/LOCATION inherited via CROSSREF from Doe2015/LOCATION" ] + "section0/Doe2015/number" -> "section0/Aristotle2015/number" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/NUMBER inherited via CROSSREF from Doe2015/NUMBER" ] + "section0/Doe2015/publisher" -> "section0/Aristotle2015/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/PUBLISHER inherited via CROSSREF from Doe2015/PUBLISHER" ] + "section0/Doe2015/series" -> "section0/Aristotle2015/series" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/SERIES inherited via CROSSREF from Doe2015/SERIES" ] "section0/Doe2015/subtitle" -> "section0/Aristotle2015/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/BOOKSUBTITLE inherited via CROSSREF from Doe2015/SUBTITLE" ] + "section0/Doe2015/title" -> "section0/Aristotle2015/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/BOOKTITLE inherited via CROSSREF from Doe2015/TITLE" ] + "section0/Doe2015/titleaddon" -> "section0/Aristotle2015/booktitleaddon" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/BOOKTITLEADDON inherited via CROSSREF from Doe2015/TITLEADDON" ] + "section0/Doe2015/venue" -> "section0/Aristotle2015/venue" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/VENUE inherited via CROSSREF from Doe2015/VENUE" ] + "section0/Doe2015/year" -> "section0/Aristotle2015/year" [ penwidth="2.0", color="#7d7879", tooltip="Aristotle2015/YEAR inherited via CROSSREF from Doe2015/YEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.dot new/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.dot --- old/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.dot 2016-04-16 23:19:50.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.dot 2016-11-25 19:28:14.000000000 +0100 @@ -45,12 +45,12 @@ - "section0/Deluz1972/year" -> "section0/GuilielmusdeBoldensele/year" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/YEAR inherited via CROSSREF from Deluz1972/YEAR" ] "section0/Deluz1972/author" -> "section0/GuilielmusdeBoldensele/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/BOOKAUTHOR inherited via CROSSREF from Deluz1972/AUTHOR" ] - "section0/Deluz1972/volumes" -> "section0/GuilielmusdeBoldensele/volumes" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/VOLUMES inherited via CROSSREF from Deluz1972/VOLUMES" ] - "section0/Deluz1972/title" -> "section0/GuilielmusdeBoldensele/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/BOOKTITLE inherited via CROSSREF from Deluz1972/TITLE" ] "section0/Deluz1972/editor" -> "section0/GuilielmusdeBoldensele/editor" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/EDITOR inherited via CROSSREF from Deluz1972/EDITOR" ] "section0/Deluz1972/institution" -> "section0/GuilielmusdeBoldensele/institution" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/INSTITUTION inherited via CROSSREF from Deluz1972/INSTITUTION" ] + "section0/Deluz1972/title" -> "section0/GuilielmusdeBoldensele/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/BOOKTITLE inherited via CROSSREF from Deluz1972/TITLE" ] "section0/Deluz1972/type" -> "section0/GuilielmusdeBoldensele/type" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/TYPE inherited via CROSSREF from Deluz1972/TYPE" ] + "section0/Deluz1972/volumes" -> "section0/GuilielmusdeBoldensele/volumes" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/VOLUMES inherited via CROSSREF from Deluz1972/VOLUMES" ] + "section0/Deluz1972/year" -> "section0/GuilielmusdeBoldensele/year" [ penwidth="2.0", color="#7d7879", tooltip="GuilielmusdeBoldensele/YEAR inherited via CROSSREF from Deluz1972/YEAR" ] } Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py new/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py --- old/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py 2016-04-07 22:51:23.000000000 +0200 +++ new/doc/latex/biblatex-bookinother/documentation/generate-crossref-graphs.py 2016-11-25 19:28:14.000000000 +0100 @@ -24,6 +24,7 @@ tex_file_content = "\documentclass{article}\n\ \\usepackage[tools={bookinother,morenames},bibstyle=verbose]{biblatex-multiple-dm}\n\ \\usepackage[bibstyle=multiple-dm]{biblatex}\n\ + \\usepackage{biblatex-anonymous}\n\ \\bibliography{" + file_name + "}\n\ \\begin{document}\n\ \\nocite{*}\n\ @@ -35,7 +36,7 @@ # generate the .bcf, .dot and .pdf file os.system("pdflatex " + basename) os.system("biber -output-format=dot --dot-include=crossref,field " + basename) - os.system("dot -Tpdf " + basename + ".dot " + "-o " + basename + ".pdf") + os.system("dot -Gsplines=polyline -Tpdf " + basename + ".dot " + "-o " + basename + ".pdf") # delete the temporary files, to avoid distributing it and to have cleaner folder for ext in ["aux","bcf","blg","log","run.xml","tex"]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj new/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj 2016-04-17 03:17:27.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-bookinother.doc category Package -revision 40559 +revision 43619 shortdesc doc files of biblatex-bookinother relocated 1 -docfiles size=117 +docfiles size=148 RELOC/doc/latex/biblatex-bookinother/README RELOC/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf RELOC/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex @@ -13,6 +13,12 @@ RELOC/doc/latex/biblatex-bookinother/documentation/example-bookincollection.bib RELOC/doc/latex/biblatex-bookinother/documentation/example-bookincollection.dot RELOC/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.bib + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.dot + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininbook.bib + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininbook.dot + RELOC/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf RELOC/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.bib RELOC/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.dot RELOC/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf ++++++ biblatex-bookinother.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bookinother/bookinother.bbx new/tex/latex/biblatex-bookinother/bookinother.bbx --- old/tex/latex/biblatex-bookinother/bookinother.bbx 2016-04-16 23:19:50.000000000 +0200 +++ new/tex/latex/biblatex-bookinother/bookinother.bbx 2017-03-27 23:41:40.000000000 +0200 @@ -14,7 +14,7 @@ %0. Preamble \ProvidesFile{bookinother.bbx} -[2016/04/16 v2.0.0a biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2017/03/27 v2.3.0 biblatex bibliography style to have entry type for book edited in other entry type (MR)] \RequireBiber \RequirePackage{xpatch} @@ -23,12 +23,13 @@ {\RequireBibliographyStyle{verbose}} -% 1. The drivers + +% 1. The drivers for new entrytype \DeclareBibliographyDriver{inarticle}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -39,7 +40,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{maintitle}% \newunit\newblock \usebibmacro{bybookeditor}% @@ -61,12 +62,117 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} + + +\DeclareBibliographyDriver{ininarticle}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock% + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit + \usebibmacro{bybookineditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bybookauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{booktitle}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bymainauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle}% + \newunit\newblock + \usebibmacro{bybookeditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + + + +\DeclareBibliographyDriver{ininbook}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit + \usebibmacro{bybookineditor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bybookauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{booktitle}% + \newunit + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bymainauthor}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{edition}% + \newunit + \printfield{volume}% + \printfield{part}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry}} + \DeclareBibliographyDriver{inincollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -77,7 +183,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit \printlist{language}% @@ -127,7 +233,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock% + \setunit{\printdelim{nametitledelim}}\newblock% \usebibmacro{title}% \newunit \printlist{language}% @@ -138,7 +244,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit \printlist{language}% @@ -195,7 +301,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit \printlist{language}% @@ -206,7 +312,7 @@ \newunit\newblock \usebibmacro{in:}% \usebibmacro{bybookauthor}% - \setunit{\labelnamepunct}\newblock + \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% \newunit\newblock \printfield{note}% @@ -246,8 +352,10 @@ \DeclareBibliographyAlias{bookinreference}{incollection} \DeclareBibliographyAlias{bookininreference}{inincollection} \DeclareBibliographyAlias{bookinthesis}{inthesis} +\DeclareBibliographyAlias{bookininbook}{ininbook} +\DeclareBibliographyAlias{bookininarticle}{ininarticle} -\DeclareSourcemap{ +\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ \map{ \step[typesource=inmastersthesis, typetarget=inthesis, final] @@ -283,26 +391,23 @@ } % 3.b Booinkeditor + +% 3.b.i Tools for patching +\newcommand{\bookinother@patch@failed}[1]{\PackageError{bookinother}{Unable to patch #1 driver}} + +% 3.b.ii Patch standard drivers \xpatchbibdriver{incollection}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{bybookineditor}} {} - {} + {\bookinother@patch@failed{incollection}} \xpatchbibdriver{inproceedings}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{bybookineditor}} {} - {} + {\bookinother@patch@failed{inproceedings}} -\newbibmacro*{bybookineditor}{% - \ifnameundef{bookineditor} - {} - {\usebibmacro{bytypestrg}{bookineditor}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{bookineditor}% - \newunit}% - } \xpatchbibdriver{article}% {\usebibmacro{byauthor}} @@ -312,7 +417,35 @@ {}% } {} - {} + {\bookinother@patch@failed{article}} + + + +% 3.b.iii Declare Bibmacro +\ifdefined\abx@macro@bybookineditor\else% + \newbibmacro*{bybookineditor}{% + \ifnameundef{bookineditor} + {}% + {\usebibmacro{bytypestrg}{bookineditor}{editor}% + \setunit{\addspace}% + \printnames[byeditor]{bookineditor}% + \newunit% + \ifnamesequal{bookineditor}{editor}% + {\clearname{editor}}% + {}% + }% + }% +\fi% + +% 3.c Mainauthor + +\DeclareNameAlias{mainauthor}{bookauthor} +\DeclareNameAlias{bymainauthor}{bybookauthor} + +\newbibmacro*{bymainauthor}{% + \ifnamesequal{mainauthor}{bookauthor} + {} + {\printnames{mainauthor}}} % 4. The formats for classical fields @@ -322,7 +455,9 @@ ininproceedings,% ininreference,% inthesis,% + ininbook, ]{title}{\mkbibquote{#1\isdot}} + \DeclareFieldFormat[% inincollection,% bookinincollection,% @@ -332,8 +467,18 @@ bookininproceedings,% ininreference,% bookininreference,% + ininbook,% + bookininbook,% + ininarticle,% + bookininarticle% ]{booktitle}{\mkbibquote{#1\isdot}} -\DeclareFieldFormat[inarticle,bookinarticle]{maintitle}{\mkbibquote{#1\isdot}} + +\DeclareFieldFormat[% + inarticle,bookinarticle,% + ininarticle,bookininarticle% + ]{maintitle}{\mkbibquote{#1\isdot}} + + % Inspired from biblatex.def \DeclareFieldFormat[inarticle,bookinarticle]{series}{% series of a journal @@ -350,6 +495,7 @@ \inherit{ineditor}{bookeditor}% \inherit{title}{maintitle}% \inherit{subtitle}{mainsubtitle}% + \inherit{titleaddon}{maintitleaddon}% \noinherit{shorttitle} \noinherit{sorttitle} \noinherit{indextitle} @@ -367,10 +513,23 @@ \noinherit{indexsorttitle} } -\DeclareDataInheritance{inproceedings,incollection,inreference}{bookinincollection,inincollection,bookininproceedings,inproceedings,ininreference,bookininreference}{ +\DeclareDataInheritance% + {inproceedings, + incollection, + inreference, + inbook, + }% + {% + bookinincollection,inincollection,% + bookininproceedings,inproceedings,% + ininreference,bookininreference,% + bookininbook,ininbook,% + }{% \inherit{author}{bookauthor}% \inherit{title}{booktitle}% \inherit{subtitle}{booksubtitle}% + \inherit{titleaddon}{booktitleaddon}% + \inherit{bookauthor}{mainauthor}% \inherit{booktitle}{maintitle}% \inherit{booksubtitle}{mainsubtitle}% \inherit{booktitleaddon}{maintitleaddon}% @@ -401,8 +560,20 @@ \noinherit{indexsorttitle} } - - +\DeclareDataInheritance{inarticle}{bookininarticle,ininarticle}{% + \inherit{author}{bookauthor}% + \inherit{bookauthor}{mainauthor}% + \inherit{title}{booktitle}% + \inherit{subtitle}{booksubtitle}% + \inherit{titleaddon}{booktitleaddon}% + \inherit{booktitle}{maintitle}% + \inherit{booksubtitle}{mainsubtitle}% + \inherit{booktitleaddon}{maintitleaddon}% + \noinherit{shorttitle} + \noinherit{sorttitle} + \noinherit{indextitle} + \noinherit{indexsorttitle} +} % 6. Label name @@ -417,11 +588,59 @@ bookinreference,% bookinthesis,% bookinphdthesis,% - bookinmathesis + bookinmathesis, + bookininbook + bookininarticle ]{% \field{shortauthor} \field{author} \field{ineditor} \field{bookineditor} } + +% 7. For biblatex-bookinother + +\listadd\opcit@booktitle@entrytypes{inarticle} +\listadd\opcit@booktitle@entrytypes{bookinarticle} +\listadd\opcit@booktitle@entrytypes@novolume{inarticle} +\listadd\opcit@booktitle@entrytypes@novolume{bookinarticle} + +\listadd\opcit@booktitle@entrytypes{inincollection} +\listadd\opcit@booktitle@entrytypes{bookinincollection} + +\listadd\opcit@booktitle@entrytypes{ininproceedings} +\listadd\opcit@booktitle@entrytypes{bookininproceedings} + +\listadd\opcit@booktitle@entrytypes{ininreference} +\listadd\opcit@booktitle@entrytypes{bookininreference} + +\listadd\opcit@booktitle@entrytypes{inthesis} +\listadd\opcit@booktitle@entrytypes{bookinthesis} + +\listadd\opcit@booktitle@entrytypes{inphdthesis} +\listadd\opcit@booktitle@entrytypes{bookphdinthesis} + +\listadd\opcit@booktitle@entrytypes{inmathesis} +\listadd\opcit@booktitle@entrytypes{bookinmathesis} + +\listadd\opcit@booktitle@entrytypes{inincollection} +\listadd\opcit@booktitle@entrytypes{bookinincollection} + +\listadd\opcit@booktitle@entrytypes{inthesis} +\listadd\opcit@booktitle@entrytypes{bookinthesis} + +\listadd\opcit@booktitle@entrytypes{ininproceedings} +\listadd\opcit@booktitle@entrytypes{bookininproceedings} + +\listadd\opcit@booktitle@entrytypes{ininreference} +\listadd\opcit@booktitle@entrytypes{bookininreference} + +\listadd\opcit@booktitle@entrytypes{ininbook} +\listadd\opcit@booktitle@entrytypes{bookininbook} + +\listadd\opcit@booktitle@entrytypes{ininarticle} +\listadd\opcit@booktitle@entrytypes{bookininarticle} +\listadd\opcit@booktitle@entrytypes@novolume{ininarticle} +\listadd\opcit@booktitle@entrytypes@novolume{bookininarticle} + \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bookinother/bookinother.dbx new/tex/latex/biblatex-bookinother/bookinother.dbx --- old/tex/latex/biblatex-bookinother/bookinother.dbx 2016-04-16 23:19:50.000000000 +0200 +++ new/tex/latex/biblatex-bookinother/bookinother.dbx 2017-03-27 23:41:40.000000000 +0200 @@ -13,13 +13,14 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{bookinother.dbx} -[2016/04/16 v2.0.0a biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2017/03/27 v2.3.0 biblatex bibliography style to have entry type for book edited in other entry type (MR)] %1. New fields \DeclareDatamodelFields[type=list,datatype=name]{ bookeditor, bookineditor, + mainauthor, } %2. For bookinother entrytypes @@ -41,10 +42,17 @@ inarticle, bookinincollection,bookininproceedings,bookininreference,% inincollection,ininproceedings,ininreference,% - bookinjournal% + bookinjournal,% + ininbook,bookininbook,% ]{% bookineditor } +\DeclareDatamodelEntryfields[% + ininarticle,bookininarticle% + ]{% + bookineditor, + mainauthor,% + } %3. For standard entry type \DeclareDatamodelEntryfields[ bookincollection,bookinproceedings,bookinreference diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bookinother.tlpobj new/tlpkg/tlpobj/biblatex-bookinother.tlpobj --- old/tlpkg/tlpobj/biblatex-bookinother.tlpobj 2016-04-17 03:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-bookinother.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -1,17 +1,17 @@ name biblatex-bookinother category Package -revision 40559 +revision 43619 shortdesc Manage book edited in other entry type relocated 1 longdesc This package provides new BibLaTeX entry types and fields for longdesc book edited in other types, like for instance @bookinarticle. longdesc It offers more types than the older package biblatex- longdesc bookinarticle which it superseeds. -runfiles size=4 +runfiles size=6 RELOC/tex/latex/biblatex-bookinother/bookinother.bbx RELOC/tex/latex/biblatex-bookinother/bookinother.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-bookinother -catalogue-date 2016-04-16 16:55:21 +0200 +catalogue-date 2017-03-27 18:32:12 +0200 catalogue-license lppl1.3 catalogue-topics humanities biblatex -catalogue-version 2.0.0a +catalogue-version 2.3.0 ++++++ biblatex-bwl.doc.tar.xz ++++++ ++++++ biblatex-bwl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bwl.tlpobj new/tlpkg/tlpobj/biblatex-bwl.tlpobj --- old/tlpkg/tlpobj/biblatex-bwl.tlpobj 2016-04-14 18:42:10.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-bwl.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -3,14 +3,14 @@ revision 26556 shortdesc BibLaTeX citations for FU Berlin relocated 1 -longdesc The bundle provides a set of biblatex implementations of +longdesc The bundle provides a set of BibLaTeX implementations of longdesc bibliography and citation styles for the Business longdesc Administration Department of the Free University of Berlin. runfiles size=2 RELOC/tex/latex/biblatex-bwl/bwl-FU.bbx RELOC/tex/latex/biblatex-bwl/bwl-FU.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-bwl -catalogue-date 2015-08-03 05:58:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bus-study biblatex catalogue-version 0.02 ++++++ biblatex-caspervector.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/ChangeLog.txt new/doc/latex/biblatex-caspervector/ChangeLog.txt --- old/doc/latex/biblatex-caspervector/ChangeLog.txt 2016-03-31 23:15:21.000000000 +0200 +++ new/doc/latex/biblatex-caspervector/ChangeLog.txt 2017-03-02 00:01:03.000000000 +0100 @@ -1,4 +1,33 @@ -2016-03-22. v0.2.5 +2017-03-01. v0.2.7 + + * API changes: + - caspervector.bbx: provide undocumented option for uglification. + + * Changes to package code: + - caspervector.bbx: fix "et al" and `\final*delim'. + - caspervector.bbx: make switch between C/E punctuations easier. + - caspervector.bbx: remove niche feature. + + * Changes to documentation: + - readme.bib: double brace institution names. + - readme.tex: remove manual loading of CJKspace. + + * Misc: + - utils/qa: add notice about copyright line updates. + - Minor fixes and cosmetics. + +2016-05-24. v0.2.6 + + * Changes to package code: + - caspervector.bbx: add code in case uglification is demanded. + + * Changes to documentation: + - readme.tex: improve description of split sorting. + + * Misc: + - Minor fixes and cosmetics. + +2016-03-31. v0.2.5 * Changes to package code: - caspervector.bbx: add overlooked `minnames = 3' and `minitems = 3'. @@ -62,7 +91,7 @@ 2014-05-24, v0.2.0 - * Changes to API: + * API changes: - Chinese references now (only) require language == {chinese}. - `userf' becomes an internal entry field (backward compatible for now). @@ -128,7 +157,7 @@ 2012-05-13, v0.1.3 - * Changes to API: + * API changes: - Chinese references now require (userf == 'zh' || userf == 'cn'). - Add {ce,ec}nty sorting scheme, default to ecnty. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/readme.bib new/doc/latex/biblatex-caspervector/readme.bib --- old/doc/latex/biblatex-caspervector/readme.bib 2016-03-31 23:15:21.000000000 +0200 +++ new/doc/latex/biblatex-caspervector/readme.bib 2017-03-02 00:01:03.000000000 +0100 @@ -118,7 +118,7 @@ title = {The cataloguer's way through AACR2: from document receipt to document retrieval}, type = {M}, location = {London}, - publisher = {The Library Association}, + publisher = {{The Library Association}}, year = {1990}, language = {english}, } @@ -128,7 +128,7 @@ title = {Probability, random variable, and random signal principles (4th ed.)}, type = {M}, location = {New York}, - publisher = {McGraw Hill}, + publisher = {{McGraw Hill}}, year = {2001}, language = {english}, } @@ -251,7 +251,7 @@ volume = {1}, number = {1}, location = {Washington, D. C.}, - publisher = {American Association for the Advancement of Science}, + publisher = {{American Association for the Advancement of Science}}, language = {english}, } @@ -447,17 +447,17 @@ title = {Futuer libraries: dreams, madness \& reality}, type = {M}, location = {Chicago}, - publisher = {American Library Association}, + publisher = {{American Library Association}}, year = {1995}, language = {english}, } @book{a1-7, - author = {{International Federation of Library Association and institutions}}, + author = {{International Federation of Library Association and Institutions}}, title = {Names of persons: national usages for entry in catalogues (3rd ed.)}, type = {M}, location = {London}, - publisher = {IFLA International Office for UBC}, + publisher = {{IFLA International Office for UBC}}, year = {1977}, language = {english}, } @@ -476,7 +476,7 @@ author = {Rood, H. J.}, title = {Logic and structured design for computer programmers (3rd ed.)}, type = {M}, - publisher = {Brooks/Cole-Thomson Learning}, + publisher = {{Brooks/Cole-Thomson Learning}}, year = {2001}, language = {english}, } @@ -495,7 +495,7 @@ title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961}, type = {C}, location = {Toronto}, - publisher = {University of Toronto Press}, + publisher = {{University of Toronto Press}}, year = {1963}, language = {english}, } @@ -515,7 +515,7 @@ title = {Guidelines for handling excavated acid-producing materials, PB 91-194001}, type = {R}, location = {Springfield}, - publisher = {U.S. Department of Commerce National Information Service}, + publisher = {{U.S. Department of Commerce National Information Service}}, year = {1990}, language = {english}, } @@ -545,7 +545,7 @@ title = {Infrared spectroscopic studies on solid oxygen}, type = {D}, location = {Berkeley}, - publisher = {Univ. of California}, + publisher = {{Univ. of California}}, year = {1965}, language = {english}, } @@ -617,7 +617,7 @@ bookauthor = {Prewitt, C. T.}, booktitle = {Pyroxense}, location = {Washington, D. C.}, - publisher = {Mineralogical Society of America}, + publisher = {{Mineralogical Society of America}}, year = {c1980}, pages = {117-211}, language = {english}, @@ -627,7 +627,7 @@ author = {Fourney, M. E.}, title = {Advances in holographic photoelasticity}, type = {C}, - bookauthor = {American Society of Mechanical Engineers, Applied Mechanics Division}, + bookauthor = {{American Society of Mechanical Engineers, Applied Mechanics Division}}, booktitle = {Symposium on Applications of Holography in Mechanics, August 23--25, 1971, University of Southern California, Los Angeles, California}, location = {New York}, publisher = {ASME}, @@ -643,7 +643,7 @@ bookauthor = {Pattle, L. W. and Cox, B. J.}, booktitle = {Electronic resources: selection and bibliographic control}, location = {New York}, - publisher = {The Haworth Press}, + publisher = {{The Haworth Press}}, year = {1966}, pages = {85-96}, language = {english}, @@ -776,7 +776,7 @@ title = {Fractals and chaos in geology and geophysics}, type = {M/OL}, location = {New York}, - publisher = {Cambridge University Press}, + publisher = {{Cambridge University Press}}, year = {1992}, url = {http://www.seg.org/reviews/mccorm30.html}, urldate = {1998-09-23}, @@ -788,7 +788,7 @@ title = {Project scheduler}, type = {CP/DK}, location = {Sunnyvale, Calif.}, - publisher = {Scitor Corporation}, + publisher = {{Scitor Corporation}}, year = {c1983}, language = {english}, } Binary files old/doc/latex/biblatex-caspervector/readme.pdf and new/doc/latex/biblatex-caspervector/readme.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/readme.tex new/doc/latex/biblatex-caspervector/readme.tex --- old/doc/latex/biblatex-caspervector/readme.tex 2016-03-31 23:15:21.000000000 +0200 +++ new/doc/latex/biblatex-caspervector/readme.tex 2017-03-02 00:01:03.000000000 +0100 @@ -23,7 +23,6 @@ giveninits = true, sortgiveninits = true ]{biblatex} \usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo} -\unless\ifxetex\usepackage{CJKspace}\fi \pagestyle{fancy}\fancyhf{}\cfoot{\thepage} \renewcommand{\headrulewidth}{0pt} @@ -40,13 +39,13 @@ \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \begin{document} -\title{\textbf{biblatex 参考文献和引用样式：\texttt{caspervector} v0.2.5}} +\title{\textbf{biblatex 参考文献和引用样式：\texttt{caspervector} v0.2.7}} \author{% Casper Ti.\ Vector\thanks{\ % \href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.% }% } -\date{2016/03/31} +\date{2017/03/01} \maketitle \section{引言} @@ -75,7 +74,7 @@ \section{许可协议} -版权所有 \copyright\ 2012--2015 Casper Ti.\ Vector。% +版权所有 \copyright\ 2012--2017 Casper Ti.\ Vector。% \verb|caspervector| 参考文献和引用样式以 \hologo{LaTeX} Project Public License\footnote{\ % \url{http://www.latex-project.org/lppl/}.% @@ -169,12 +168,6 @@ 可以将参考文献加入目录中；当其值为 \verb|bibnumbered| 时，参考文献列表参与章节编号（当然也会被自动加入目录中）。 - \item \verb|sorting = 排序方案|： - 对这一部分的文献按照指定的方案排序。此设置会覆盖全局设置。\myemph{% - 注： - 只有同时使用 2.x 或之后版本的 biblatex 和相应兼容版本的 biber， - 才能对每个 \texttt{\string\printbibliography} 命令采用不同的排序方案。% - } \end{itemize} 例如，用 @@ -332,9 +325,8 @@ \section{对参考文献进行分类排序}\label{sec:catsort} -使用 biblatex 3.4 或更新版本的用户可以通过 -对不同的 \verb|\printbibliography| 命令传递不同的 \verb|sorting| 选项来实现 -对不同部分文献按不同方案排序。 +使用 biblatex 3.4 或更新版本的用户可以通过对不同的 \verb|\printbibliography| +命令采用不同的调用环境来实现对不同部分文献按不同方案排序。例如，如需对被引用的文献按照引用顺序排序，而对未引用的文献按照英文文献在前、中文文献在后排序，则可以在导言区中加入下列几行代码： @@ -377,7 +369,7 @@ \printbibliography% [notcategory = cited, ..., sorting = ecnty, title = {Works Not Cited}] \end{Verbatim} -biblatex 3.0--3.3 中有一个 bug\footnote{% +biblatex 3.0--3.3 中有一个 bug\footnote{\ % 可以参考 \url{https://tex.stackexchange.com/questions/250548/}。% } 导致分类排序失效，此问题基本无解。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj new/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj 2016-04-19 17:44:54.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-caspervector.doc category Package -revision 40613 +revision 43371 shortdesc doc files of biblatex-caspervector relocated 1 -docfiles size=98 +docfiles size=97 RELOC/doc/latex/biblatex-caspervector/ChangeLog.txt RELOC/doc/latex/biblatex-caspervector/Makefile RELOC/doc/latex/biblatex-caspervector/readme.bib ++++++ biblatex-caspervector.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def new/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def --- old/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def 2016-03-31 23:15:21.000000000 +0200 +++ new/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def 2017-03-02 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2014 Casper Ti. Vector +% Copyright (c) 2012-2016 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-gbk.def}% - [2016/03/31 v0.2.5 Chinese punctuations and captions in GBK] + [2017/03/01 v0.2.7 Chinese punctuations and captions in GBK] \newcommand*\bbx@cnldquot{��} \newcommand*\bbx@cnrdquot{��} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def new/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def --- old/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def 2016-03-31 23:15:21.000000000 +0200 +++ new/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def 2017-03-02 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2014 Casper Ti. Vector +% Copyright (c) 2012-2016 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{biblatex-caspervector-utf8.def}% - [2016/03/31 v0.2.5 Chinese punctuations and captions in UTF-8] + [2017/03/01 v0.2.7 Chinese punctuations and captions in UTF-8] \newcommand*\bbx@cnldquot{“} \newcommand*\bbx@cnrdquot{”} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector.bbx new/tex/latex/biblatex-caspervector/caspervector.bbx --- old/tex/latex/biblatex-caspervector/caspervector.bbx 2016-03-31 23:15:21.000000000 +0200 +++ new/tex/latex/biblatex-caspervector/caspervector.bbx 2017-03-02 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2016 Casper Ti. Vector +% Copyright (c) 2012-2017 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -20,16 +20,18 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.bbx}% - [2016/03/31 v0.2.5 Casper Ti. Vector's biblatex bibliography style] + [2017/03/01 v0.2.7 Casper Ti. Vector's biblatex bibliography style] \RequireBiber[3] \RequireBibliographyStyle{numeric} \newtoggle{bbx:gbk} +\newtoggle{bbx:ugly} \DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}} \DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}} +\DeclareBibliographyOption{ugly}[true]{\settoggle{bbx:ugly}{#1}} \ExecuteBibliographyOptions{ - alldates = iso8601, gbk, defernumbers = true, + gbk, ugly = false, alldates = iso8601, defernumbers = true, sorting = none, minnames = 3, minitems = 3 } \AtEndOfPackage{% @@ -39,62 +41,76 @@ }{ \input{biblatex-caspervector-utf8.def} \ExecuteBibliographyOptions{texencoding = UTF-8} + } + \iftoggle{bbx:ugly}{ + \newcommand*{\bbx@cepunct}[2]{#2} + \DefineBibliographyStrings{english}{ + andmore = {\bbx@cetext{\bbx@cnetal}{et\addabbrvspace al\adddot}}, + andothers = {\bbx@cetext{\bbx@cnetal}{et\addabbrvspace al\adddot}}, + } + \DeclareFieldFormat*{booktitle}{#1} + \DeclareFieldFormat*{journaltitle}{#1} + \DeclareFieldFormat*{title}{#1} + \DeclareFieldFormat*{year}{#1} + \DeclareFieldFormat*{volume}{#1} + }{ + \newcommand*{\bbx@cepunct}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}} + \DefineBibliographyStrings{english}{ + andmore = + {\bbx@cetext{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, + andothers = + {\bbx@cetext{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, + } + \DeclareFieldFormat*{booktitle}{\mkbibemph{#1}} + \DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}} + \DeclareFieldFormat*{title}{\mkbibemph{#1}} + \DeclareFieldFormat*{year}{\mkbibbold{#1}} + \DeclareFieldFormat*{volume}{\mkbibemph{#1}} + \DeclareFieldFormat[inbook, inproceedings, incollection, article]% + {title}{\bbx@mybibquote{\mkbibemph{#1}}} }% } -\newcommand*{\bbx@cegen}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}} -\newcommand*{\bbx@cecomma}{\bbx@cegen{\bbx@cncomma}{\addcomma\addspace}} -\newcommand*{\bbx@cecolon}{\bbx@cegen{\bbx@cncolon}{\addcolon\addspace}} -\newcommand*{\bbx@cescolon}{\bbx@cegen{\bbx@cnscolon}{\addsemicolon\addspace}} -\newcommand*{\bbx@ceperiod}{\bbx@cegen{\bbx@cnperiod}{\addperiod\addspace}} -\newcommand*{\bbx@cespace}{\bbx@cegen{}{\addspace}} +\newcommand*{\bbx@cetext}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}} +\newcommand*{\bbx@cecomma}{\bbx@cepunct{\bbx@cncomma}{\addcomma\addspace}} +\newcommand*{\bbx@cecolon}{\bbx@cepunct{\bbx@cncolon}{\addcolon\addspace}} +\newcommand*{\bbx@cescolon}{\bbx@cepunct{\bbx@cnscolon}{\addsemicolon\addspace}} +\newcommand*{\bbx@ceperiod}{\bbx@cepunct{\bbx@cnperiod}{\addperiod\addspace}} +\newcommand*{\bbx@cespace}{\bbx@cepunct{}{\addspace}} \newcommand*{\bbx@mybibquote}[1]% - {\bbx@cegen{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}} + {\bbx@cepunct{\bbx@cnldquot{#1}\bbx@cnrdquot}{\mkbibquote{#1}}} \renewcommand*{\finallistdelim}% - {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}} + {\bbx@cetext{\bbx@cecomma}{\addspace\bibstring{and}\space}} \renewcommand*{\finalnamedelim}% - {\bbx@cegen{\bbx@cncomma}{\addspace\bibstring{and}\space}} + {\bbx@cetext{\bbx@cecomma}{\addspace\bibstring{and}\space}} \renewcommand*{\multilistdelim}{\bbx@cecomma} \renewcommand*{\multinamedelim}{\bbx@cecomma} -\renewcommand*{\andmoredelim}{\bbx@cespace} -\renewcommand*{\andothersdelim}{\bbx@cespace} \renewcommand*{\postnotedelim}{\bbx@cecomma} -\renewcommand*{\finentrypunct}{\bbx@cegen{\bbx@cnperiod}{.}} -\renewcommand{\bibendnotewrapper}[1]{\bibsentence #1\bbx@cnperiod} -\renewcommand{\bibfootnotewrapper}[1]{\bibsentence #1\bbx@cnperiod} +\renewcommand*{\finentrypunct}{\bbx@cepunct{\bbx@cnperiod}{.}} \DefineBibliographyExtras{english}{% - \renewcommand*{\finalandcomma}{\bbx@cegen{\addspace}{}}% + \renewcommand*{\finalandcomma}{}% } + \DefineBibliographyStrings{english}{ - andmore = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, - andothers = {\bbx@cegen{\bbx@cnetal}{\mkbibemph{et\addabbrvspace al\adddot}}}, bibliography = {\bbx@cnbib}, references = {\bbx@cnbib} } - -\DeclareFieldFormat*{booktitle}{\mkbibemph{#1}} -\DeclareFieldFormat*{journaltitle}{\mkbibemph{#1}} -\DeclareFieldFormat*{title}{\mkbibemph{#1}} -\DeclareFieldFormat*{year}{\mkbibbold{#1}} -\DeclareFieldFormat*{volume}{\mkbibemph{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{#1} -\DeclareFieldFormat[inbook, inproceedings, incollection, article]% - {title}{\bbx@mybibquote{\mkbibemph{#1}}} \DeclareFieldFormat*{type}{\mkbibbrackets{#1}} \DeclareFieldFormat*{number}{\mkbibparens{#1}} \DeclareFieldFormat[patent]{number}{#1} \renewbibmacro*{title}{\iffieldundef{title}{}{\printfield{title}}} \newbibmacro*{type}{\iffieldundef{type}{}{\printfield{type}}} \newbibmacro*{number}{\iffieldundef{number}{}{\printfield{number}}} -\newbibmacro*{cein:}{\printtext{\bbx@cegen{\bbx@cnin}{In}\bbx@cecolon}} +\newbibmacro*{cein:}{\printtext{\bbx@cetext{\bbx@cnin}{In}\bbx@cecolon}} \newcommand*{\bbx@byspace}[1]{% \ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}% } \newbibmacro*{cebyauthor}{% \ifnameundef{author}{}{% - \bbx@cegen% + \bbx@cetext% {\printnames{author}\printtext{\bbx@byspace{author}\bbx@cnauth}}% % `\usebibmacro{byauthor}' does not print with `useauthor' enabled. {\printnames[byauthor]{author}}% @@ -102,14 +118,14 @@ } \newbibmacro*{cebyeditor}{% \ifnameundef{editor}{}{% - \bbx@cegen% + \bbx@cetext% {\printnames{editor}\printtext{\bbx@byspace{editor}\bbx@cnedit}}% {\usebibmacro{byeditor}}% }% } \newbibmacro*{cebytranslator}{% \ifnameundef{translator}{}{% - \bbx@cegen% + \bbx@cetext% {\printnames{translator}\printtext{\bbx@byspace{translator}\bbx@cntrans}}% {\usebibmacro{bytranslator}}% }% @@ -145,7 +161,7 @@ } \renewbibmacro*{urldate}{% \iffieldundef{urlyear}{}{% - \printtext{\bbx@cegen{\bbx@cnretr}{retrieved on}\addspace}% + \printtext{\bbx@cetext{\bbx@cnretr}{retrieved on}\addspace}% \printurldate% }% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector.cbx new/tex/latex/biblatex-caspervector/caspervector.cbx --- old/tex/latex/biblatex-caspervector/caspervector.cbx 2016-03-31 23:15:21.000000000 +0200 +++ new/tex/latex/biblatex-caspervector/caspervector.cbx 2017-03-02 00:01:05.000000000 +0100 @@ -20,7 +20,7 @@ % biblatex-caspervector-utf8.def \ProvidesFile{caspervector.cbx}% - [2016/03/31 v0.2.5 Casper Ti. Vector's biblatex citation style] + [2017/03/01 v0.2.7 Casper Ti. Vector's biblatex citation style] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-caspervector.tlpobj new/tlpkg/tlpobj/biblatex-caspervector.tlpobj --- old/tlpkg/tlpobj/biblatex-caspervector.tlpobj 2016-04-19 17:44:54.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-caspervector.tlpobj 2017-04-14 17:31:45.000000000 +0200 @@ -1,18 +1,18 @@ name biblatex-caspervector category Package -revision 40613 +revision 43371 shortdesc A simple citation style for Chinese users relocated 1 longdesc The package provides a simple and easily extensible longdesc biblography/citation style for Chinese LaTeX users, using -longdesc biblatex. +longdesc BibLaTeX. runfiles size=6 RELOC/tex/latex/biblatex-caspervector/biblatex-caspervector-gbk.def RELOC/tex/latex/biblatex-caspervector/biblatex-caspervector-utf8.def RELOC/tex/latex/biblatex-caspervector/caspervector.bbx RELOC/tex/latex/biblatex-caspervector/caspervector.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-caspervector -catalogue-date 2016-03-31 13:36:50 +0200 +catalogue-date 2017-03-01 14:00:03 +0100 catalogue-license lppl1.3 catalogue-topics biblatex chinese -catalogue-version 0.2.5 +catalogue-version 0.2.7 ++++++ biblatex-chem.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/LICENSE.md new/doc/latex/biblatex-chem/LICENSE.md --- old/doc/latex/biblatex-chem/LICENSE.md 2016-03-02 00:37:50.000000000 +0100 +++ new/doc/latex/biblatex-chem/LICENSE.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -Released under the [LaTeX Project Public -License](http://www.latex-project.org/lppl.txt), v1.3c or later. - -The package has status 'maintained': the current maintainer is -[Joseph Wright](joseph.wright(a)morningstar2.co.uk). \ No newline at end of file Binary files old/doc/latex/biblatex-chem/biblatex-chem-acs.pdf and new/doc/latex/biblatex-chem/biblatex-chem-acs.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-acs.tex new/doc/latex/biblatex-chem/biblatex-chem-acs.tex --- old/doc/latex/biblatex-chem/biblatex-chem-acs.tex 2016-03-13 22:18:36.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem-acs.tex 2017-02-02 00:01:03.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{chem-acs} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1p, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1s, last revised 2017/02/01.}} +\date{Released 2017/02/01} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -52,7 +52,7 @@ \end{document} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-chem/biblatex-chem-angew.pdf and new/doc/latex/biblatex-chem/biblatex-chem-angew.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-angew.tex new/doc/latex/biblatex-chem/biblatex-chem-angew.tex --- old/doc/latex/biblatex-chem/biblatex-chem-angew.tex 2016-03-13 22:18:36.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem-angew.tex 2017-02-02 00:01:03.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{chem-angew} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1p, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1s, last revised 2017/02/01.}} +\date{Released 2017/02/01} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -51,7 +51,7 @@ \end{document} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf and new/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-biochem.tex new/doc/latex/biblatex-chem/biblatex-chem-biochem.tex --- old/doc/latex/biblatex-chem/biblatex-chem-biochem.tex 2016-03-13 22:18:36.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem-biochem.tex 2017-02-02 00:01:03.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{chem-biochem} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1p, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1s, last revised 2017/02/01.}} +\date{Released 2017/02/01} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -52,7 +52,7 @@ \end{document} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf and new/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-rsc.tex new/doc/latex/biblatex-chem/biblatex-chem-rsc.tex --- old/doc/latex/biblatex-chem/biblatex-chem-rsc.tex 2016-03-13 22:18:36.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem-rsc.tex 2017-02-02 00:01:03.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{chem-rsc} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1p, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1s, last revised 2017/02/01.}} +\date{Released 2017/02/01} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -51,7 +51,7 @@ \end{document} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem.bib new/doc/latex/biblatex-chem/biblatex-chem.bib --- old/doc/latex/biblatex-chem/biblatex-chem.bib 2016-03-02 00:37:50.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem.bib 2017-02-02 00:01:03.000000000 +0100 @@ -474,7 +474,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright at morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-chem/biblatex-chem.pdf and new/doc/latex/biblatex-chem/biblatex-chem.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem.tex new/doc/latex/biblatex-chem/biblatex-chem.tex --- old/doc/latex/biblatex-chem/biblatex-chem.tex 2016-03-13 22:18:36.000000000 +0100 +++ new/doc/latex/biblatex-chem/biblatex-chem.tex 2017-02-02 00:01:03.000000000 +0100 @@ -21,8 +21,8 @@ {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{\pkg{biblatex-chem} -- A set of \pkg{biblatex} implementations of chemistry-related bibliography styles% - \footnote{This file describes v1.1p, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1s, last revised 2017/02/01.}} +\date{Released 2017/02/01} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -218,13 +218,17 @@ titles in \emph{Angew. Chem.} style} \changes{v1.1o}{2016/03/09}{Track \pkg{biblatex} changes} \changes{v1.1p}{2016/03/13}{Ensure style works with both backends} +\changes{v1.1q}{2016/09/14}{Print year only for date fields} +\changes{v1.1q}{2016/09/14}{Omit \texttt{language} field in bibliography} +\changes{v1.1r}{2016/12/26}{Track \pkg{biblatex} core changes} +\changes{v1.1s}{2017/02/01}{Remove a stray space} \PrintChanges \end{document} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-chem.doc.tlpobj new/tlpkg/tlpobj/biblatex-chem.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-chem.doc.tlpobj 2016-04-14 18:42:10.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-chem.doc.tlpobj 2017-04-14 17:31:46.000000000 +0200 @@ -1,10 +1,9 @@ name biblatex-chem.doc category Package -revision 40015 +revision 43116 shortdesc doc files of biblatex-chem relocated 1 -docfiles size=402 - RELOC/doc/latex/biblatex-chem/LICENSE.md +docfiles size=400 RELOC/doc/latex/biblatex-chem/README.md RELOC/doc/latex/biblatex-chem/biblatex-chem-acs.pdf RELOC/doc/latex/biblatex-chem/biblatex-chem-acs.tex ++++++ biblatex-chem.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-acs.bbx new/tex/latex/biblatex-chem/chem-acs.bbx --- old/tex/latex/biblatex-chem/chem-acs.bbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-acs.bbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.bbx}[2016/03/13 v1.1p biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2017/02/01 v1.1s biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -44,6 +44,7 @@ % Alter settings that carry through from biblatex \ExecuteBibliographyOptions { + date = year , doi = false , eprint = false , giveninits = true , @@ -327,8 +328,6 @@ \newunit } {}% - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{bytranslator+others}% @@ -360,8 +359,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \printfield{edition}% \newunit \printfield{volumes}% @@ -403,8 +400,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -478,8 +473,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -526,8 +519,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -571,8 +562,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addspace}% \usebibmacro{in:}% @@ -613,8 +602,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% @@ -658,8 +645,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -693,8 +678,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addspace}% \printfield{type}% @@ -728,8 +711,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addsemicolon\space}% \printfield{type}% @@ -761,7 +742,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-acs.cbx new/tex/latex/biblatex-chem/chem-acs.cbx --- old/tex/latex/biblatex-chem/chem-acs.cbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-acs.cbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.cbx}[2016/03/13 v1.1p biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2017/02/01 v1.1s biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-angew.bbx new/tex/latex/biblatex-chem/chem-angew.bbx --- old/tex/latex/biblatex-chem/chem-angew.bbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-angew.bbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.bbx}[2016/03/13 v1.1p biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2017/02/01 v1.1s biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -44,6 +44,7 @@ % Alter settings that carry through from biblatex \ExecuteBibliographyOptions { + date = year , doi = false , eprint = false , giveninits = true , @@ -116,7 +117,10 @@ {\multinamedelim}% } \renewcommand*{\intitlepunct}{\addspace} -\renewcommand*{\mkbibnameaffix}[1]{\addcomma\space#1} +\ifdef{\mkbibnamesuffix} + {\renewcommand*{\mkbibnamesuffix}} + {\renewcommand*{\mkbibnameaffix}}% + [1]{\addcomma\space#1} \renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings @@ -393,8 +397,6 @@ \newunit } {}% - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{bytranslator+others}% @@ -428,8 +430,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -464,8 +464,6 @@ \usebibmacro{begentry}% \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock \printfield{volumes}% @@ -497,8 +495,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -541,8 +537,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -583,8 +577,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addspace}% \usebibmacro{in:}% @@ -625,8 +617,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% @@ -668,8 +658,6 @@ \setunit*{\addspace}% \usebibmacro{byholder}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \printfield{type}% @@ -700,8 +688,6 @@ \usebibmacro{begentry}% \usebibmacro{author}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \printfield{note}% @@ -729,7 +715,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-angew.cbx new/tex/latex/biblatex-chem/chem-angew.cbx --- old/tex/latex/biblatex-chem/chem-angew.cbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-angew.cbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.cbx}[2016/03/13 v1.1p biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2017/02/01 v1.1s biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -38,7 +38,7 @@ {\usebibmacro{cite:dump}} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-biochem.bbx new/tex/latex/biblatex-chem/chem-biochem.bbx --- old/tex/latex/biblatex-chem/chem-biochem.bbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-biochem.bbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.bbx}[2016/03/13 v1.1p biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2017/02/01 v1.1s biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -45,6 +45,7 @@ \ExecuteBibliographyOptions { articletitle = true , + date = year , doi = false , eprint = false , giveninits = true , @@ -102,7 +103,10 @@ } \renewcommand*{\intitlepunct}{\addspace} \renewcommand*{\labelnamepunct}{\addspace} -\renewcommand*{\mkbibnameaffix}[1]{\addcomma\addspace#1} +\ifdef{\mkbibnamesuffix} + {\renewcommand*{\mkbibnamesuffix}} + {\renewcommand*{\mkbibnameaffix}}% + [1]{\addcomma\space#1} \renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings @@ -193,7 +197,7 @@ \mkbibnamefirst{#2}\isdot}% \ifblank{#4}{} {\addlowpenspace - \mkbibnameaffix{#4}\isdot}} + \mkbibnamesuffix{#4}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibnamelast{#1}\isdot @@ -206,7 +210,7 @@ \mkbibnameprefix{#3}\isdot}% \ifblank{#4}{} {\addlowpenspace - \mkbibnameaffix{#4}\isdot}}% + \mkbibnamesuffix{#4}\isdot}}% } \renewbibmacro*{note+pages}{% @@ -331,8 +335,6 @@ \newunit } {}% - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{bytranslator+others}% @@ -364,8 +366,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \printfield{edition}% \newunit \printfield{volumes}% @@ -407,8 +407,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -482,8 +480,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -530,8 +526,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit \iftoggle{bbx:chaptertitle} @@ -575,8 +569,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addspace}% \usebibmacro{in:}% @@ -617,8 +609,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% @@ -662,8 +652,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -697,8 +685,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \setunit{\addspace}% \printfield{type}% @@ -726,7 +712,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-biochem.cbx new/tex/latex/biblatex-chem/chem-biochem.cbx --- old/tex/latex/biblatex-chem/chem-biochem.cbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-biochem.cbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.cbx}[2016/03/13 v1.1p biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2017/02/01 v1.1s biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -19,7 +19,7 @@ \renewcommand*\bibrightbracket{)\midsentence} %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-rsc.bbx new/tex/latex/biblatex-chem/chem-rsc.bbx --- old/tex/latex/biblatex-chem/chem-rsc.bbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-rsc.bbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.bbx}[2016/03/13 v1.1p biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2017/02/01 v1.1s biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -44,6 +44,7 @@ % Alter settings that carry through from biblatex \ExecuteBibliographyOptions { + date = year , doi = false , eprint = false , giveninits = true , @@ -99,11 +100,11 @@ % Simple modifications to punctuation, etc. \renewcommand*{\intitlepunct}{\addspace} -\renewcommand*{\mkbibnameaffix}[1]{\addcomma\space#1} +\renewcommand*{\mkbibnamesuffix}[1]{\addcomma\space#1} \renewcommand*{\newunitpunct}{\addcomma\addspace} \DefineBibliographyExtras{english}{% - \renewrobustcmd*{\finalandcomma}{} + \renewrobustcmd*{\finalandcomma}{}% } % Bibliography strings @@ -337,8 +338,6 @@ \newunit } {}% - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{bytranslator+others}% @@ -372,8 +371,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -407,8 +404,6 @@ \usebibmacro{begentry}% \usebibmacro{maintitle+title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock \printfield{volumes}% @@ -440,8 +435,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \iftoggle{bbx:chaptertitle} @@ -482,8 +475,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \iftoggle{bbx:chaptertitle} @@ -522,8 +513,6 @@ \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{maintitle+booktitle}% @@ -561,8 +550,6 @@ \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \newunit - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% @@ -602,8 +589,6 @@ \usebibmacro{begentry}% \usebibmacro{author}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \printfield{type}% @@ -636,8 +621,6 @@ \usebibmacro{begentry}% \usebibmacro{author}% \setunit{\labelnamepunct}\newblock - \printlist{language}% - \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock \printfield{note}% @@ -665,7 +648,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-rsc.cbx new/tex/latex/biblatex-chem/chem-rsc.cbx --- old/tex/latex/biblatex-chem/chem-rsc.cbx 2016-03-13 22:18:36.000000000 +0100 +++ new/tex/latex/biblatex-chem/chem-rsc.cbx 2017-02-02 00:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.cbx}[2016/03/13 v1.1p biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2017/02/01 v1.1s biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2014,2016 by +%% Copyright (C) 2010-2014,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-chem.tlpobj new/tlpkg/tlpobj/biblatex-chem.tlpobj --- old/tlpkg/tlpobj/biblatex-chem.tlpobj 2016-04-14 18:42:11.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-chem.tlpobj 2017-04-14 17:31:46.000000000 +0200 @@ -1,14 +1,14 @@ name biblatex-chem category Package -revision 40015 +revision 43116 shortdesc A set of BibLaTeX implementations of chemistry-related bibliography styles relocated 1 longdesc The bundle offers a set of styles to allow chemists to use -longdesc biblatex. The package has complete styles for: all ACS +longdesc BibLaTeX. The package has complete styles for: all ACS longdesc journals; RSC journals using standard (Chem. Commun.) style; longdesc and Angewandte Chem. style, (thus covering a wide range of longdesc journals). A comprehensive set of examples of use is included. -runfiles size=25 +runfiles size=24 RELOC/tex/latex/biblatex-chem/chem-acs.bbx RELOC/tex/latex/biblatex-chem/chem-acs.cbx RELOC/tex/latex/biblatex-chem/chem-angew.bbx @@ -18,7 +18,7 @@ RELOC/tex/latex/biblatex-chem/chem-rsc.bbx RELOC/tex/latex/biblatex-chem/chem-rsc.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-chem -catalogue-date 2016-03-13 13:13:43 +0100 +catalogue-date 2017-02-01 08:59:39 +0100 catalogue-license lppl1.3 catalogue-topics biblatex chemistry journalpub -catalogue-version 1.1p +catalogue-version 1.1s ++++++ biblatex-chicago.doc.tar.xz ++++++ ++++ 14470 lines of diff (skipped) ++++++ biblatex-chicago.tar.xz ++++++ ++++ 20333 lines of diff (skipped) ++++++ biblatex-dw.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/CHANGES new/doc/latex/biblatex-dw/CHANGES --- old/doc/latex/biblatex-dw/CHANGES 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/CHANGES 2016-12-07 00:01:03.000000000 +0100 @@ -1,9 +1,31 @@ -biblatex-dw 2013/09/22 v1.6a -Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2016/12/06 v1.7 +Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> Version history --------------- +v1.7 [2016/12/06] +This version of biblatex-dw needs at least biblatex 3.3 and was testet with +biblatex 3.6 and biber 2.6. +- New option "citeauthorname" (instead of "firstfullname") which can take the + values "normal" (\citeauthor and \textcite print the surname only, as in + standard biblatex), "firstfull" (at the first use of \citeauthor or \textcite, + the full name is printed, otherwise the surname only; thus, this is the + behaviour of the former option "firstfullname") and "full" (the full name is + always printed when using \citeauthor or \textcite). The default for this option + is "normal". +- Option "firstfullname" has been dropped (see above, option "citeauthorname"). +- Option "series" can now take the values "standard", "afteryear" and + "beforeedition". The latter is new and prints the series ahead of the edition. + The default for this option is "standard". +- BUGFIX: From version 3.3 of biblatex, \DeclareNameFormat has changed. This + version of biblatex-dw is now compatible with the new syntax. +- BUGFIX: In some circumstances, the option "inreference=full" was broken. This + should be fixed now. +- BUGFIX: In some cases, @review in combination with the xref functionality + suppressed the output of pages. This should be fixed. +- Compatibility with biblatex 2.9 regarding the list of shorthands. + v1.6a [2013/09/22] This version of biblatex-dw was tested with biblatex 2.7a and biber 1.7. - New option "inreference" (authortitle-dw only) which can take the values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/LIESMICH new/doc/latex/biblatex-dw/LIESMICH --- old/doc/latex/biblatex-dw/LIESMICH 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/LIESMICH 2016-12-07 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -biblatex-dw 2013/09/22 v1.6a -Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2016/12/06 v1.7 +Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> ************************************************************ @@ -111,9 +111,9 @@ * Ondrej Salvet * Johann Konrad Schwarz * Salome Södergran * Jonas Stein * Matthias Steinbrink * Philipp Stephani - * Bernhard Tempel * Dominik Weber - * Christian Weitert * Christofer Zwanzig - * Дмитрий Гордеев + * Bernhard Tempel * Herbert Voss + * Dominik Weber * Christian Weitert + * Christofer Zwanzig * Дмитрий Гордеев 7. Lizenz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/README new/doc/latex/biblatex-dw/README --- old/doc/latex/biblatex-dw/README 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/README 2016-12-07 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -biblatex-dw 2013/09/22 v1.6a -Copyright (c) 2008-2013 Dominik Waßenhoven <domwass(at)web.de> +biblatex-dw 2016/12/06 v1.7 +Copyright (c) 2008-2016 Dominik Waßenhoven <domwass(at)web.de> ************************************************************ @@ -105,9 +105,9 @@ * Ondrej Salvet * Johann Konrad Schwarz * Salome Södergran * Jonas Stein * Matthias Steinbrink * Philipp Stephani - * Bernhard Tempel * Dominik Weber - * Christian Weitert * Christofer Zwanzig - * Дмитрий Гордеев + * Bernhard Tempel * Herbert Voss + * Dominik Weber * Christian Weitert + * Christofer Zwanzig * Дмитрий Гордеев 7. Licence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/biblatex-dw-preamble.tex new/doc/latex/biblatex-dw/biblatex-dw-preamble.tex --- old/doc/latex/biblatex-dw/biblatex-dw-preamble.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/biblatex-dw-preamble.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,17 +1,17 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 % % This file is the preamble for the documentation of % biblatex-dw (both the English and the German version) %%%%% biblatex-dw Version %%%%% version of biblatex-dw %%%%% -\newcommand{\biblatexdwversion}{1.6a} -\newcommand{\biblatexdwdate}{\printdate{2013-09-22}} -\newcommand{\mindestanforderung}{1.7}% minimum biblatex version -\newcommand{\testversion}{2.7a}% tested biblatex version -\newcommand{\biberversion}{1.7}% tested biber version +\newcommand{\biblatexdwversion}{1.7} +\newcommand{\biblatexdwdate}{\printdate{2016-12-06}} +\newcommand{\mindestanforderung}{3.3}% minimum biblatex version +\newcommand{\testversion}{3.6}% tested biblatex version +\newcommand{\biberversion}{2.6}% tested biber version \newcommand{\screenversion}{} \newcommand{\TOC}{} \newcommand{\lizenz}{} @@ -75,7 +75,7 @@ %%%%% Verschiedene Pakete %%%%% Miscellaneous packages \usepackage{microtype}% optischer Randausgleich -\usepackage{dtklogos}% Logos wie \BibTeX +\usepackage{dtk-logos}% Logos wie \BibTeX etc. \usepackage{xspace} \usepackage{textcomp}% Text-Companion-Symbole \usepackage{manfnt}% für das Achtung-Symbol diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/biblatex-dw-print.tex new/doc/latex/biblatex-dw/biblatex-dw-print.tex --- old/doc/latex/biblatex-dw/biblatex-dw-print.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/biblatex-dw-print.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,6 +1,6 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 % % This file configures the documentation % of biblatex-dw to be printed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/biblatex-dw-screen.tex new/doc/latex/biblatex-dw/biblatex-dw-screen.tex --- old/doc/latex/biblatex-dw/biblatex-dw-screen.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/biblatex-dw-screen.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,6 +1,6 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 % % This file configures the documentation % of biblatex-dw to be viewed on a screen Binary files old/doc/latex/biblatex-dw/biblatex-dw.pdf and new/doc/latex/biblatex-dw/biblatex-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/biblatex-dw.tex new/doc/latex/biblatex-dw/biblatex-dw.tex --- old/doc/latex/biblatex-dw/biblatex-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/biblatex-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -274,11 +274,11 @@ \addspace vol\adddot\space} \end{lstlisting} \item The\beschreibung{series} option \option{series} affects the position of the \texttt{series} - field. If set to \wert{afteryear}, the series is printed after the - year. This affects the entry types \texttt{@book}, \texttt{@inbook}, + field, possible values are \wert{afteryear}, \wert{beforeedition} and \wert{standard}. This affects the entry types \texttt{@book}, \texttt{@inbook}, \texttt{@collection}, \texttt{@incollection}, \texttt{@proceedings}, - \texttt{@inproceedings} and \texttt{@manual}. The standard value for - this option is \wert{standard}. + \texttt{@inproceedings} and \texttt{@manual}. + If set to \wert{afteryear} or \wert{beforeedition}, the series will be put after the year or before the edition. + The standard value for this option is \wert{standard}, the series will be printed before the location. \item The\beschreibung{seriesformat} option \option{seriesformat} can take the values \wert{standard} and \wert{parens}. If set to \wert{parens}, \texttt{series} and \texttt{number} (of a book etc.) @@ -483,22 +483,23 @@ Author: Title, in: Book, pp.\,100--150, here p.\,125. \end{quote} - \item The\beschreibung{firstfullname} option \option{firstfullname=true} offers the possibility to have - authors\slash editors printed with first name and last name for the - first citation when using the commands \cmd{citeauthor} or - \cmd{textcite}; only when they are cited for the second time, the last - name is printed on its own. This works also with different citations - from the same author such as the full name is only given with the - first citation. It does not matter, if you only use \cmd{citeauthor} - or {textcite} or both. The standard for this option is \wert{false} - (i.e. only the last names are printed). - \item The\beschreibung{citeauthor} \option{citeauthor} option controls the name format for the - \cmd{citeauthor} command; it can take the values \wert{namefont}, \wert{namefontfoot} and - \wert{normalfont}. With \option{citeauthor=namefont} the same format as set by the option - \option{namefont} is used. This is the default behaviour. With \option{citeauthor=normalfont} - the normal font is always used for \cmd{citeauthor}, regardless of the \option{namefont} option. - With \option{citeauthor=namefontfoot} the \option{namefont} format is used if the + \item The\beschreibung{citeauthor} \option{citeauthor} option controls the name format for + the \cmd{citeauthor} command; it can take the values \wert{namefont}, + \wert{namefontfoot} and \wert{normalfont}. With \option{citeauthor=namefont} the + same format as set by the option \option{namefont} is used. This is the default + behaviour. With \option{citeauthor=normalfont} the normal font is always used for + \cmd{citeauthor}, regardless of the \option{namefont} option. With + \option{citeauthor=namefontfoot} the \option{namefont} format is used if the \cmd{citeauthor} command is inside a footnote, otherwise the normal font is used. + \item The\beschreibung{citeauthorname} option \option{citeauthorname} controls the + appearance of names when using the the commands \cmd{citeauthor} and \cmd{textcite}. + With \option{citeauthorname=firsfull}, the name is given in full when cited for the + first time; from the second citation onwards, only the last name is printed. This + works also with different citations from the same author, regardless whether you + only use \cmd{citeauthor} or \cmd{textcite} or both. With + \option{citeauthorname=full} the name is always given in full, with + \option{citeauthorname=normal} only the given name is printed. + The default value for this option is \wert{normal}. \item If\beschreibung{singletitle} you use the \bl{} option \option{singletitle=true}, the title of a cited work is only printed if there is more than one work of the same author. See the biblatex documentation for details. @@ -673,6 +674,11 @@ Specifies the font shape of the authors' names when the \cmd{citeauthor} command is used. Possible values are \wert{namefont}, \wert{normalfont} and \wert{namefontfoot}. + \optlist{citeauthorname}{normal} + Controls the name output when using \cmd{citeauthor} or \cmd{textcite}. With + \wert{firstfull} the full name is printed at first citation, at all + subsequent citations only the last name is printed. With \wert{full} the full name is + always printed, whereas \wert{normal} always gives the given name only. \optlist{citedas}{true} The first citation (in \xbx{authortitle-dw} only if the option \option{firstfull} is used) is followed by the string @@ -702,10 +708,6 @@ The edition is printed as superscript number straight ahead of the year. \optlist[\xbx{authortitle-dw} only]{firstfull}{false} The first citation is printed with full reference. - \optlist{firstfullname}{false} - At the first citation with \cmd{citeauthor} or \cmd{textcite} - the full name is printed, at all - subsequent citations only the last name is printed. \optlist{firstnamefont}{normal} Specifies the font shape of the first names of authors and editors as well as of name affixes and (if \option{useprefix} is set to \wert{false}) of @@ -775,7 +777,7 @@ \option{pseudoauthor} are \emph{not} printed. \optlist{series}{standard} Position of a work's \texttt{series}: with \wert{standard} as in the - standard styles, with \wert{afteryear} after the \texttt{year}. + standard styles, with \wert{afteryear} after the \texttt{year}, with \wert{beforeedition} before the \texttt{edition}. \optlist{seriesformat}{parens} Format of a work's \texttt{series}: with \wert{standard} as in the standard styles, with \wert{parens} in parentheses. Binary files old/doc/latex/biblatex-dw/de-biblatex-dw.pdf and new/doc/latex/biblatex-dw/de-biblatex-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/de-biblatex-dw.tex new/doc/latex/biblatex-dw/de-biblatex-dw.tex --- old/doc/latex/biblatex-dw/de-biblatex-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/de-biblatex-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -2,7 +2,7 @@ %!TEX encoding = UTF-8 Unicode % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2013 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2016 % % Diese Datei enthält die deutschsprachige Dokumentation von biblatex-dw @@ -333,11 +333,10 @@ \end{lstlisting} \item Die\beschreibung{series} Option \option{series} bestimmt die Position der Reihe (Feld - \texttt{series}). Setzt man sie auf \wert{afteryear}, wird die Reihe - nach dem Jahr ausgegeben. Das betrifft die Typen \texttt{@book}, + \texttt{series}), möglich sind die Werte \wert{afteryear}, \wert{beforeedition} und \wert{standard}. Das betrifft die Typen \texttt{@book}, \texttt{@inbook}, \texttt{@collection}, \texttt{@incollection}, - \texttt{@proceedings}, \texttt{@inproceedings} und \texttt{@manual}. - Der Standardwert für diese Option ist \wert{standard}. + \texttt{@proceedings}, \texttt{@inproceedings} und \texttt{@manual}. Bei \wert{afteryear} wird die Reihe nach dem Jahr ausgegeben, bei \wert{beforeedition} vor der Auf"|lage. + Der Standardwert für diese Option ist \wert{standard}, die Reihe wird dann vor dem Ort ausgegeben. \item Die\beschreibung{seriesformat} Option \option{seriesformat} kann die Werte \wert{standard} und \wert{parens} annehmen. Mit \wert{parens} werden Reihe und Nummer eines Werkes (\texttt{series} und @@ -561,24 +560,27 @@ Autor: Titel, in: Buch, S.\,100--150, hier S.\,125. \end{quote} - \item Mit\beschreibung{firstfullname} - der Option \option{firstfullname=true} hat man die Möglichkeit, beim ersten - Zitieren eines Autors\slash Herausgebers mit dem Befehl \cmd{citeauthor} - oder mit dem Befehl \cmd{textcite} automatisch den vollen Namen - ausgeben zu lassen; erst beim zweiten Zitieren wird dann nur der Nachname - ausgegeben. Das funktioniert auch bei unterschiedlichen Literaturverweisen - desselben Autors, so dass auch dann der volle Name nur beim ersten Verweis - ausgegeben wird. Dabei ist es egal, ob man nur \cmd{citeauthor}, nur \cmd{textcite} - oder beide Befehle gemischt einsetzt. Der Standard für diese Option ist - \wert{false} (d.\,h., es wird immer nur der Nachname ausgegeben). \item Die\beschreibung{citeauthor} Option \option{citeauthor} bestimmt das Format für den Befehl \cmd{citeauthor}; sie kann die Werte \wert{namefont}, \wert{namefontfoot} und - \wert{normalfont} annehmen. Mit \option{citeauthor=namefont} wird das Format benutzt, - das mit der Option \option{namefont} eingestellt wurde. Dies ist die Standardeinstellung. - Mit \option{citeauthor=normalfont} wird immer die normale Schrift für \cmd{citeauthor} - benutzt, unabhängig von der Einstellung der Option \option{namefont}. Mit - \option{citeauthor=namefontfoot} wird das \option{namefont}"=Format benutzt, wenn der - \cmd{citeauthor}"=Befehl in einer Fußnote steht, ansonsten wird die normale Schrift benutzt. + \wert{normalfont} annehmen. Mit \option{citeauthor=namefont} wird das Format + benutzt, das mit der Option \option{namefont} eingestellt wurde. Dies ist die + Standardeinstellung. Mit \option{citeauthor=normalfont} wird immer die normale + Schrift für \cmd{citeauthor} benutzt, unabhängig von der Einstellung der Option + \option{namefont}. Mit \option{citeauthor=namefontfoot} wird das + \option{namefont}"=Format benutzt, wenn der \cmd{citeauthor}"=Befehl in einer + Fußnote steht, ansonsten wird die normale Schrift benutzt. + \item Mit\beschreibung{citeauthorname} + der Option \option{citeauthorname} hat man die Möglichkeit, die Namensform + beim Zitieren eines Autors\slash Herausgebers mit dem Befehl \cmd{citeauthor} + oder mit dem Befehl \cmd{textcite} zu steuern. \option{citeauthorname=firstfull} + bewirkt, dass beim ersten Zitieren der volle Name ausgegeben wird und bei allen + weiteren Zitaten nur der Nachname. Das funktioniert auch bei unterschiedlichen + Literaturverweisen desselben Autors, so dass auch dann der volle Name nur beim + ersten Verweis ausgegeben wird. Dabei ist es egal, ob man nur \cmd{citeauthor}, + nur \cmd{textcite} oder beide Befehle gemischt einsetzt. Mit + \option{citeauthorname=full} wird immer der volle Name ausgegeben, mit + \option{citeauthorname=normal} wird immer nur der Nachname ausgegeben. + Der Standard für diese Option ist \wert{normal}. \item Mit\beschreibung{singletitle} der \bl"=Option \option{singletitle=true} wird der Titel eines Werkes nur dann ausgegeben, wenn mehr als ein Werk desselben Autors vorhanden ist. @@ -769,6 +771,11 @@ Legt den Schriftschnitt der Autorennamen bei Verwendung des Befehls \cmd{citeauthor} fest. Mögliche Werte sind \wert{namefont}, \wert{normalfont} und \wert{namefontfoot}. + \optlist{citeauthorname}{normal} + Legt fest, ob bei \cmd{citeauthor} oder \cmd{textcite} nur der Nachname oder der volle + Name ausgegeben wird. Mögliche Werte sind \wert{normal} (nur Nachname), \wert{full} + (immer voller Name) und \wert{firstfull} (beim ersten Zitat voller Name, danach nur + Nachname). \optlist{citedas}{true} Bei Einträgen mit \texttt{shorthand} wird dem Erstzitat (bei \xbx{authortitle-dw} nur mit der Option \option{firstfull}) ein @@ -800,10 +807,6 @@ dem Jahr ausgegeben. \optlist[nur \xbx{authortitle-dw}]{firstfull}{false} Beim ersten Zitat wird die volle Literaturangabe ausgegeben. - \optlist{firstfullname}{false} - Beim ersten Zitat mit \cmd{citeauthor} oder \cmd{textcite} - wird der volle Name ausgegeben, bei - allen weiteren Zitaten nur der Nachname. \optlist{firstnamefont}{normal} Legt den Schriftschnitt der Vornamen von Autoren und Editoren fest, ebenso von Namensaffixen und (mit der Option \option{useprefix=false}) @@ -879,7 +882,7 @@ \option{pseudoauthor} \emph{nicht} ausgegeben. \optlist{series}{standard} Position der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie - in den Standard"=Stilen, bei \wert{afteryear} nach dem Jahr + in den Standard"=Stilen, bei \wert{afteryear} nach dem Jahr und bei \wert{beforeedition} vor der Auf"|lage (\texttt{year}\slash \texttt{date}). \optlist{seriesformat}{parens} Format der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie in Binary files old/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf and new/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex new/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex --- old/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,4 +1,4 @@ -% v 1.6a +% v 1.7 % This file presents the `authortitle-dw' style % \listfiles @@ -14,6 +14,7 @@ % addyear=true, annotation=true, % citeauthor=normalfont,%namefontfoot,%namefont, +% citeauthorname=firstfull,%full,%normal % citedas=false, % citepages=suppress,%omit,%permit,%separate, % edbyidem=false, @@ -21,7 +22,6 @@ % edstringincitations=false, % edsuper=true, % firstfull=true, -% firstfullname=true, % firstnamefont=smallcaps,%italic,%bold, % ibidemfont=smallcaps,%italic,%bold, % idembib=false, @@ -39,7 +39,7 @@ % origfieldsformat=parens,%brackets,%punct, % pagetotal=true, % pseudoauthor=false, -% series=afteryear, + series=beforeedition,%afteryear,%beforeedition,%standard % shorthandibid=false, % shorthandinbib=true, % shorthandwidth=40pt,%3em, Binary files old/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf and new/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/examples/de-footnote-dw.tex new/doc/latex/biblatex-dw/examples/de-footnote-dw.tex --- old/doc/latex/biblatex-dw/examples/de-footnote-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/examples/de-footnote-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,4 +1,4 @@ -% v 1.6a +% v 1.7 % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} Binary files old/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf and new/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex new/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex --- old/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,4 +1,4 @@ -% v 1.6a +% v 1.7 % This file presents the `authortitle-dw' style % \documentclass[a4paper]{article} Binary files old/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf and new/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-dw/examples/en-footnote-dw.tex new/doc/latex/biblatex-dw/examples/en-footnote-dw.tex --- old/doc/latex/biblatex-dw/examples/en-footnote-dw.tex 2013-09-25 00:34:38.000000000 +0200 +++ new/doc/latex/biblatex-dw/examples/en-footnote-dw.tex 2016-12-07 00:01:03.000000000 +0100 @@ -1,4 +1,4 @@ -% v 1.6a +% v 1.7 % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-dw.doc.tlpobj new/tlpkg/tlpobj/biblatex-dw.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-dw.doc.tlpobj 2016-04-14 18:42:16.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-dw.doc.tlpobj 2017-04-14 17:31:49.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-dw.doc category Package -revision 31752 +revision 42649 shortdesc doc files of biblatex-dw relocated 1 -docfiles size=492 +docfiles size=491 RELOC/doc/latex/biblatex-dw/CHANGES RELOC/doc/latex/biblatex-dw/LIESMICH RELOC/doc/latex/biblatex-dw/README ++++++ biblatex-dw.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx new/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx --- old/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% authortitle-dw.bbx, Dominik Waßenhoven 2013 +% authortitle-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{authortitle-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] \RequireBibliographyStyle{standard-dw} @@ -328,7 +328,7 @@ % oder 'options = {oldbookauthor=true}' % werden nicht in der Schrift von 'namefont' gesetzt % Formatierung der Nachnamen entsprechend der Option 'namefont' -\renewcommand*{\mkbibnamelast}[1]{% +\renewcommand*{\mkbibnamefamily}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and @@ -356,7 +356,7 @@ {\bbx@namefont{#1}}} % Formatierung der Vornamen entsprechend der Option 'firstnamefont' -\renewcommand*{\mkbibnamefirst}[1]{% +\renewcommand*{\mkbibnamegiven}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and @@ -415,7 +415,7 @@ {\bbx@firstnamefont{#1}}}} % suffix richtet sich nach 'firstnamefont' -\renewcommand*{\mkbibnameaffix}[1]{% +\renewcommand*{\mkbibnamesuffix}[1]{% \ifboolexpr{ ( bool {bbx:oldauthor} and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/bbx/footnote-dw.bbx new/tex/latex/biblatex-dw/bbx/footnote-dw.bbx --- old/tex/latex/biblatex-dw/bbx/footnote-dw.bbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/bbx/footnote-dw.bbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% footnote-dw.bbx, Dominik Waßenhoven 2013 +% footnote-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{footnote-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] \RequireBibliographyStyle{authortitle-dw} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/bbx/standard-dw.bbx new/tex/latex/biblatex-dw/bbx/standard-dw.bbx --- old/tex/latex/biblatex-dw/bbx/standard-dw.bbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/bbx/standard-dw.bbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,12 +1,12 @@ -% standard-dw.bbx, Dominik Waßenhoven 2013 +% standard-dw.bbx, Dominik Waßenhoven 2016 -\ProvidesFile{standard-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/11/13} +\@ifpackagelater{biblatex}{2016/03/11} {} {\PackageError{biblatex-dw} {Outdated 'biblatex' package\MessageBreak - Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak + Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak I found: '\csuse{ver(a)biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now}% \endinput} @@ -19,7 +19,9 @@ \newbool{bbx:acronym} \newbool{bbx:journumafteryear} \newbool{bbx:journumdate} +\newbool{bbx:seriesstandard} \newbool{bbx:seriesafteryear} +\newbool{bbx:seriesbeforeedition} \newbool{bbx:seriesinparens} \newbool{bbx:shorthandacro} \newbool{bbx:shorthandinbib} @@ -74,15 +76,26 @@ \DeclareBibliographyOption{bernhard}[true]{% \csuse{bool#1}{bbx:bernhard}} -% Option series=standard|afteryear -\newcommand{\bbx@option@series}{} -\DeclareBibliographyOption{series}{% - \renewcommand{\bbx@option@series}{#1}} -\AtBeginDocument{% - \ifdefstring{\bbx@option@series}{afteryear} - {\global\booltrue{bbx:seriesafteryear}} - {\global\boolfalse{bbx:seriesafteryear}}} - +% Option series=standard|afteryear|beforeedition +\DeclareBibliographyOption{series}[standard]{% + \ifcsdef{bbx@opt@series@#1} + {\csuse{bbx@opt@series@#1}} + {\blxdw@error{% + Invalid option 'series=#1'\MessageBreak + Valid values are 'standard', 'afteryear', 'beforeedition'}}} +\def\bbx@opt@series@standard{% + \global\booltrue{bbx:seriesstandard}% + \global\boolfalse{bbx:seriesafteryear}% + \global\boolfalse{bbx:seriesbeforeedition}} +\def\bbx@opt@series@afteryear{% + \global\boolfalse{bbx:seriesstandard}% + \global\booltrue{bbx:seriesafteryear}% + \global\boolfalse{bbx:seriesbeforeedition}} +\def\bbx@opt@series@beforeedition{% + \global\boolfalse{bbx:seriesstandard}% + \global\boolfalse{bbx:seriesafteryear}% + \global\booltrue{bbx:seriesbeforeedition}} + % Option seriesformat=standard|parens \newcommand{\bbx@option@seriesformat}{} \DeclareBibliographyOption{seriesformat}{% @@ -206,7 +219,7 @@ \printfield{booktitle}% \newunit} -\DeclareBibliographyDriver{shorthands}{% +\DeclareBibliographyDriver{shorthand}{% \toggletrue{listofshorthands}% \usebibmacro{terselos}} @@ -216,7 +229,7 @@ %% List of Shorthands: Länge der Labels einstellbar \AtBeginDocument{% \ifbool{bbx:shorthandwidthbool} - {\defbibenvironment{shorthands} + {\defbibenvironment{shorthand} {\list {\printfield[shorthandwidth]{shorthand}% \printtext{\shorthandpunct}} @@ -229,7 +242,7 @@ \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} {\item}} - {\defbibenvironment{shorthands} + {\defbibenvironment{shorthand} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -644,13 +657,17 @@ \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -677,13 +694,17 @@ \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -714,10 +735,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -748,10 +769,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{edition}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -829,13 +850,17 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -912,13 +937,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1102,11 +1131,16 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{type}% \newunit @@ -1297,10 +1331,10 @@ \usebibmacro{byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1500,13 +1534,17 @@ \ifbool{xref:inbook}% child is an @inbook entry {\usebibmacro{byeditor+others}} {\usebibmacro{ifuse:byeditor+others}}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1546,13 +1584,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1596,10 +1638,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1650,13 +1692,17 @@ \ifbool{xref:inbook}% child is an @inbook entry {\usebibmacro{byeditor+others}} {\usebibmacro{ifuse:byeditor+others}}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1692,13 +1738,17 @@ \printlist{language}% \newunit\newblock \usebibmacro{ifuse:byeditor+others}% + \ifbool{bbx:seriesbeforeedition} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1738,10 +1788,10 @@ \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% - \setunit{\addspace}% - \ifbool{bbx:seriesafteryear} - {} - {\usebibmacro{series+number}}% + \ifbool{bbx:seriesstandard} + {\setunit{\addspace}% + \usebibmacro{series+number}} + {}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1822,13 +1872,6 @@ Thus, 'omiteditor' is ignored}} {}}% {}% - \ifdefstring{\bbx@option@series}{standard} - {} - {\ifdefstring{\bbx@option@series}{afteryear} - {} - {\blxdw@warning@noline{% - Unknown value for option 'series'.\MessageBreak - Option 'series=standard' used instead}}}% \ifdefstring{\bbx@option@seriesformat}{standard} {} {\ifdefstring{\bbx@option@seriesformat}{parens} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx new/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx --- old/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% authortitle-dw.cbx, Dominik Waßenhoven 2013 +% authortitle-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{authortitle-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2016/12/06 v1.7 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -25,7 +25,7 @@ \boolfalse{cbx:inref}} \def\cbx@opt@inreference@full{% \booltrue{cbx:inref}% - \ExecuteBibliographyOptions[inreference]{skipbib}} + \ExecuteBibliographyOptions[inreference]{skipbib=true,}} % Test, ob inreference genutzt wird \AtEveryCitekey{% @@ -115,7 +115,11 @@ \ifnameundef{labelname} {\blxdw@warning@noline{No author or editor given for \textcite}% \textbf{\thefield{entrykey}}} - {\ifbool{cbx:firstfullname} + {\ifboolexpr{ + bool {cbx:citeauthornamefirstfull} + or + bool {cbx:citeauthornamefull} + } {\printnames[citeauthor]{labelname}} {\printnames{labelname}}% \setunit{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/cbx/footnote-dw.cbx new/tex/latex/biblatex-dw/cbx/footnote-dw.cbx --- old/tex/latex/biblatex-dw/cbx/footnote-dw.cbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/cbx/footnote-dw.cbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% footnote-dw.cbx, Dominik Waßenhoven 2013 +% footnote-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{footnote-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2016/12/06 v1.7 biblatex citation style] \RequireCitationStyle{standard-dw} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/cbx/standard-dw.cbx new/tex/latex/biblatex-dw/cbx/standard-dw.cbx --- old/tex/latex/biblatex-dw/cbx/standard-dw.cbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/cbx/standard-dw.cbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,12 +1,12 @@ -% standard-dw.cbx, Dominik Waßenhoven 2013 +% standard-dw.cbx, Dominik Waßenhoven 2016 -\ProvidesFile{standard-dw.cbx}[2013/09/22 v1.6a biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2016/12/06 v1.7 biblatex citation style] -\@ifpackagelater{biblatex}{2011/11/13} +\@ifpackagelater{biblatex}{2016/03/11} {} {\PackageError{biblatex-dw} {Outdated 'biblatex' package\MessageBreak - Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak + Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak I found: '\csuse{ver(a)biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now}% \endinput} @@ -16,9 +16,10 @@ \newbool{cbx:citeauthor} \newbool{cbx:citeauthorfoot} \newbool{cbx:citeauthornormalfont} +\newbool{cbx:citeauthornamefirstfull} +\newbool{cbx:citeauthornamefull} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} -\newbool{cbx:firstfullname} \newbool{cbx:fullcite}% Test, ob fullcite ausgeführt wurde (wichtig für @review) \newbool{cbx:idemfull} \newbool{cbx:noidem} @@ -36,8 +37,6 @@ \csuse{bool#1}{cbx:citedas}} \DeclareBibliographyOption{edstringincitations}[true]{% \csuse{bool#1}{cbx:edstringincitations}} -\DeclareBibliographyOption{firstfullname}[true]{% - \csuse{bool#1}{cbx:firstfullname}} \DeclareBibliographyOption{omiteditor}[true]{% \csuse{bool#1}{cbx:omiteditor}} \DeclareBibliographyOption{shorthandibid}[true]{% @@ -64,6 +63,27 @@ \booltrue{cbx:citeauthornormalfont}% \boolfalse{cbx:citeauthorfoot}} +\DeclareBibliographyOption{citeauthorname}[normal]{% + \ifcsdef{cbx@opt@citeauthorname@#1} + {\csuse{cbx@opt@citeauthorname@#1}} + {\blxdw@error{% + Invalid option 'citeauthorname=#1'\MessageBreak + Valid values are 'normal', 'firstfull', 'full'}}} +\def\cbx@opt@citeauthorname@normal{% + \boolfalse{cbx:citeauthornamefull}% + \boolfalse{cbx:citeauthornamefirstfull}} +\def\cbx@opt@citeauthorname@firstfull{% + \boolfalse{cbx:citeauthornamefull}% + \booltrue{cbx:citeauthornamefirstfull}} +\def\cbx@opt@citeauthorname@full{% + \booltrue{cbx:citeauthornamefull}% + \boolfalse{cbx:citeauthornamefirstfull}} + +\DeclareBibliographyOption{firstfullname}[true]{% aus Kompatibilitätsgründen + \blxdw@error{% + Option 'firstfullname' is obsolete,\MessageBreak + please use option 'citeauthorname' instead}} + \DeclareBibliographyOption{ibidpage}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{loccittracker=context}}% Standard: constrict @@ -251,7 +271,7 @@ \clearname{translator}} {}} -% Option 'nameseen' +% Option 'citeauthorname' \newcommand*{\cbx@seennames}{} \newrobustcmd*{\cbx@nameseen}[1]{% \listxadd{\cbx@seennames}{\detokenize{#1}}} @@ -259,19 +279,20 @@ \xifinlist{\detokenize{#1}}{\cbx@seennames}} \AtBeginDocument{% - \ifbool{cbx:firstfullname} + \ifbool{cbx:citeauthornamefirstfull} {\DeclareNameFormat{citeauthor}{% - \cbx@ifnameseen{#1#3#5#7} + \nameparts{#1}% + \cbx@ifnameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix} {\ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% \or \ifuseprefix - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} - {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}% \fi}% - {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% - \cbx@nameseen{#1#3#5#7}}% - \usebibmacro{name:andothers}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% + \cbx@nameseen{\namepartfamily\namepartgiven\namepartprefix\namepartsuffix}}% + \usebibmacro{name:andothers}}% \DeclareCiteCommand{\citeauthor} {\booltrue{cbx:citeauthor}% \boolfalse{citetracker}% @@ -281,15 +302,31 @@ \printnames[citeauthor]{labelname}} {\multicitedelim} {\usebibmacro{postnote}}} - {\DeclareCiteCommand{\citeauthor} - {\booltrue{cbx:citeauthor}% - \boolfalse{citetracker}% - \boolfalse{pagetracker}% - \usebibmacro{prenote}} - {\indexnames{labelname}% - \printnames{labelname}} - {\multicitedelim} - {\usebibmacro{postnote}}}} + {\ifbool{cbx:citeauthornamefull} + {\DeclareNameFormat{citeauthor}{% + \nameparts{#1}% + \ifuseprefix + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}} + {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}}% + \usebibmacro{name:andothers}}% + \DeclareCiteCommand{\citeauthor} + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printnames[citeauthor]{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}}} + {\DeclareCiteCommand{\citeauthor} + {\booltrue{cbx:citeauthor}% + \boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\indexnames{labelname}% + \printnames{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}}}}} %% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont' \providecommand*{\mkibid}[1]{% @@ -416,8 +453,8 @@ {} {\usebibmacro{citeindex}% \ifentryseen{\bbx@reviewparent} - {\global\booltrue{cbx:rpcited}} - {\global\boolfalse{cbx:rpcited}}% + {\booltrue{cbx:rpcited}} + {\boolfalse{cbx:rpcited}}% \ifbool{cbx:fullcite} {\usedriver {\DeclareNameAlias{sortname}{default}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/lbx/english-dw.lbx new/tex/latex/biblatex-dw/lbx/english-dw.lbx --- old/tex/latex/biblatex-dw/lbx/english-dw.lbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/lbx/english-dw.lbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% english-dw.lbx, Dominik Waßenhoven 2013 +% english-dw.lbx, Dominik Waßenhoven 2016 -\ProvidesFile{english-dw.lbx}[2013/09/22 v1.6a biblatex localization file] +\ProvidesFile{english-dw.lbx}[2016/12/06 v1.7 biblatex localization file] \NewBibliographyString{% idemdat,% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-dw/lbx/german-dw.lbx new/tex/latex/biblatex-dw/lbx/german-dw.lbx --- old/tex/latex/biblatex-dw/lbx/german-dw.lbx 2013-09-25 00:34:38.000000000 +0200 +++ new/tex/latex/biblatex-dw/lbx/german-dw.lbx 2016-12-07 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -% german-dw.lbx, Dominik Waßenhoven 2013 +% german-dw.lbx, Dominik Waßenhoven 2016 -\ProvidesFile{german-dw.lbx}[2013/09/22 v1.6a biblatex localization file] +\ProvidesFile{german-dw.lbx}[2016/12/06 v1.7 biblatex localization file] \InheritBibliographyExtras{german} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-dw.tlpobj new/tlpkg/tlpobj/biblatex-dw.tlpobj --- old/tlpkg/tlpobj/biblatex-dw.tlpobj 2016-04-14 18:42:17.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-dw.tlpobj 2017-04-14 17:31:50.000000000 +0200 @@ -1,14 +1,14 @@ name biblatex-dw category Package -revision 31752 +revision 42649 shortdesc Humanities styles for BibLaTeX relocated 1 -longdesc A small collection of styles for the biblatex package. It was +longdesc A small collection of styles for the BibLaTeX package. It was longdesc designed for citations in the humanities and offers some longdesc features that are not provided by the standard BibLaTeX styles. -longdesc The styles are dependent on biblatex (at least version 0.9b) +longdesc The styles are dependent on BibLaTeX (at least version 0.9b) longdesc and cannot be used without it. Eine kleine Sammlung von Stilen -longdesc fur das Paket biblatex. Es ist auf geisteswissenschaftliche +longdesc fur das Paket BibLaTeX. Es ist auf geisteswissenschaftliche longdesc Zitierweise zugeschnitten und bietet einige Funktionen, die von longdesc den Standard-Stilen von BibLaTeX nicht direkt bereitgestellt longdesc werden. Das Paket baut vollstandig auf BibLaTeX auf und kann @@ -24,7 +24,7 @@ RELOC/tex/latex/biblatex-dw/lbx/english-dw.lbx RELOC/tex/latex/biblatex-dw/lbx/german-dw.lbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-dw -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-12-06 05:53:45 +0100 catalogue-license lppl catalogue-topics biblatex humanities -catalogue-version 1.6a +catalogue-version 1.7 ++++++ biblatex-fiwi.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/README new/doc/latex/biblatex-fiwi/README --- old/doc/latex/biblatex-fiwi/README 2016-05-18 23:57:41.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/README 2017-01-30 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -biblatex-fiwi 2016/05/17 v1.5 -Copyright (c) 2011-2016 Simon Spiegel <simon(at)simifilm.ch> +biblatex-fiwi 2017/01/28 v1.6c +Copyright (c) 2011-2017 Simon Spiegel <simon(at)simifilm.ch> ************************************************************ @@ -73,10 +73,12 @@ * fiwi2.dbx * biblatex-fiwi.pdf % German documentation * biblatex-fiwi.tex % German documentation + * diss.xdy % xindy sorting file + * dissff.xdy % xindy sorting file * example-biblatex-fiwi.tex % examples + * example-biblatex-fiwi.pdf % examples * example-biblatex-fiwi-options.tex % examples * example-biblatex-fiwi-options.pdf % examples - * example-biblatex-fiwi.pdf % examples * example-biblatex-fiwi2-options.tex % examples * example-biblatex-fiwi2-options.pdf % examples * example-biblatex-fiwi-xindy.tex % examples Binary files old/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf and new/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/biblatex-fiwi.tex new/doc/latex/biblatex-fiwi/biblatex-fiwi.tex --- old/doc/latex/biblatex-fiwi/biblatex-fiwi.tex 2016-05-18 23:57:41.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/biblatex-fiwi.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,1289 +0,0 @@ -%!TEX encoding = UTF-8 Unicode -%!TEX TS-program = lualatex -% !BIB TS-program = biber -% biblatex-fiwi,v 1.5 2016/05/17 - -\documentclass{ltxdockit} -\usepackage{fontspec} -\setmainfont[Extension=.otf,UprightFont= CharterITCStd-Regular, -Path = /Users/simi/FontExplorerX/C/Charter ITC Std/, -BoldFont = *-Bold, -ItalicFont = *-Italic, -BoldItalicFont = *-BoldItalic, - Ligatures = TeX] - {Charter ITC Std} -\setsansfont[Extension=.ttf,UprightFont=nimbus-sans-l_regular,BoldFont=nimbus-sans-l_bold,Path=/Users/simi/FontExplorerX/N/Nimbus Sans L/]{Nimbus Sans L} -\setmonofont[]{Courier New} -\newfontfamily\cyrillicfont[Extension=.ttf, - UprightFont= LinLibertine_Re-4.4.1, - Path=/Users/simi/FontExplorerX/L/Linux Libertine/] - {Linux Libertine} -%\usepackage[base]{babel} -\usepackage{polyglossia} -\setdefaultlanguage[latesthyphen,spelling=new,babelshorthands=true]{german} -\setotherlanguage{russian} -\usepackage[style=fiwi,series=true,publisher=true,fullcitefilm,translatedas=true,partofcited=true]{biblatex} -\newbibmacro*{altscript:cyrillic-font}[1]{% -{\cyrillicfont{\textsc{#1}}}} -\ExecuteBibliographyOptions{bibencoding=utf8} -\ExecuteBibliographyOptions{backref=false} -\usepackage[strict,style=german,german=guillemets]{csquotes} -\usepackage{btxdockit} -\usepackage{tabularx} -\usepackage{booktabs} -\usepackage{graphicx} -\usepackage{shortvrb} -\usepackage{needspace} -\usepackage{pifont} -%\usepackage{dtklogos} -\MakeAutoQuote{»}{«} -\MakeAutoQuote*{<}{>} -\MakeShortVerb{\|} -\addbibresource{examples.bib} - - - -\titlepage{% - title={Der \sty{biblatex-fiwi}-Stil}, - subtitle={Ein \sty{biblatex}-Zitierstil für Filmwissenschaftler}, - url={http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/}, - author={Simon Spiegel}, - email={simon(a)simifilm.ch}, - revision={1.5}, - date={\rcstoday}} - -\hypersetup{% - pdftitle={Das biblatex-fiwi-Paket}, - pdfsubject={Ein biblatex-Zitierstile für Filmwissenschaftler}, - pdfauthor={Simon Spiegel}, - citecolor=black, - pdfkeywords={tex, e-tex, latex, biblatex, film studies, humanities}} - -\AtBeginToc{\setcounter{tocdepth}{1}} -\AtEndToc{\setcounter{tocdepth}{5}} - -\deffootnote{2em}{2em}{\makebox[2em][l]{\thefootnotemark}} -% tables - -\newcolumntype{H}{>{\sffamily\bfseries\spotcolor}l} -\newcolumntype{P}{>{\raggedright}p{120pt}} -\newcolumntype{Q}{>{\raggedright}p{70pt}} -\newcolumntype{V}{>{\raggedright\displayverbfont}l} - -\newcommand*{\vcmd}[1]{\rotatehead{1.5em}{9.5em}{\cmd{#1}}} -\newcommand*{\venv}[1]{\rotatehead{1.5em}{9.5em}{\env{#1}}} -\newcommand*{\rotatehead}[3]{% - \makebox[#1][c]{\rotatebox{90}{\makebox[#2][l]{\scriptsize #3}}}} -\newcommand{\tickmarkyes}{\Pisymbol{psy}{183}} -\newcommand{\tickmarkno}{\textendash} - -% samples - -\definecolor{grid}{rgb}{0.7,0.7,0.7} - -\newcommand*{\mksample}[2][25]{% - \mkmetrics[#1]{#2\,\textcolor{grid}{AaGg}\,#2}} -\newcommand*{\mkmetrics}[2][25]{% - \setlength{\unitlength}{1pt}% - \linethickness{0.25pt}% - \begin{picture}(#1,0)(0,0) - %\put(0,0){\parbox[b]{#1\unitlength}{\mkgrid{\fontdimen9\font}}} - \put(0,0){\parbox[b]{#1\unitlength}{\mkgrid{\fontdimen5\font}}} - \put(0,0){\parbox[b]{#1\unitlength}{\mkgrid{0pt}}} - %\put(0,0){\parbox[b]{#1\unitlength}{\mkgrid{-\fontdimen11\font}}} - \put(0,0){\parbox[b]{#1\unitlength}{\centering #2}} - \end{picture}} -\newcommand*{\mkgrid}[1]{% - \begingroup\color{grid}% - \hrule height 0.25pt depth 0pt width \linewidth - \hrule height #1 depth 0pt width 0pt - \endgroup} - -\makeatletter - -\newcounter{@pseudofootnote} -\newcommand{\@pseudofootnote}[1]{% - \stepcounter{@pseudofootnote}% - \textsuperscript{\number\value{@pseudofootnote}}} - -\newenvironment{quotesample}[2][] - {\setquotestyle[#1]{#2}% - \setcounter{@pseudofootnote}{0}% - \let\footnote\@pseudofootnote - \trivlist - \leftskip\parindent - \small} - {\endtrivlist} - -\makeatother - -% hyphenation - -\hyphenation{% - } - -\begin{document} - -\printtitlepage -\tableofcontents -\listoftables - -\section{Einleitung} -\label{int} -\subsection[About]{Über \sty{biblatex-fiwi}} - -Ich habe den \sty{biblatex-fiwi}"=Stil ursprünglich für meine Dissertation in Filmwissenschaft geschrieben und seither kontinuierlich weiterentwickelt. Mittlerweile haben diverse Studenten und Doktoranden den Stil erfolgreich eingesetzt, ich selbst habe \sty{biblatex-fiwi} für zwei Bücher\footnote{\fullcite{Spiegel.S:2007b,Spiegel.S:2010b}.} benutzt -- der Stil ist also definitiv praxiserprobt. - -Es handelt sich bei \sty{biblatex-fiwi} nicht um die Implementierung eines definierten Standards, sondern um einen Zitierstil, der für verschiedene geisteswissenschaftliche Disziplinen geeignet sein sollte. Dabei wird dem Zitieren von Filmen und Fernsehserien besonderes Augenmerk geschenkt. Zudem liegt ein Fokus auf vertrackten Fällen, zB. Artikel in Sammelbänden innerhalb eines mehrbändigen Werks mit vielen Mitwirkenden. - -Bug"=Reports oder Fragen und Anregungen zur Weiterentwicklung des Stils sind stets willkommen. Falls sich jemand, der den Stil erfolgreich einsetzt, erkenntlich zeigen möchte, sei hier auf meine Amazon"=Wunschliste\fnurl{http://www.amazon.de/registry/wishlist/2HW0Y8SWX4QDU} verwiesen. - -\subsection{License} - -Copyright © 2003--2016 Simon Spiegel. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained. - -\subsection{Voraussetzungen} - -\sty{biblatex-fiwi} benötigt \sty{biblatex} ab Version 3.4. Die Verwendung des \bibtex-Ersatzes \bin{biber}\fnurl{http://biblatex-biber.sourceforge.net/} in der Version 2.5 oder höher wird dringend empfohlen. Zwar sollten diverse Funktionen auch mit \bibtex funktionieren, ich selber verwende aber seit längerem ausschließlich \bin{biber} und kann deshalb für nichts garantieren. Da aber sowohl \bin{biber} als auch \sty{biblatex} Bestandteil der \TeX{}"=Distributionen \TeX{}~Live\fnurl{http://www.tug.org/texlive} und MiK\TeX{}\fnurl{http://www.miktex.org} sind, sollten beide den meisten Benutzern ohnehin zur Verfügung stehen. - -\subsection{Zu dieser Anleitung} -Diese Anleitung behandelt nur die spezifischen Anpassungen und Eigenheiten von \sty{biblatex-fiwi} und ist nicht als allgemeine Einführung in \sty{biblatex} gedacht. Für Informationen zu \sty{biblatex} empfehle ich das exzellente \sty{biblatex}"=Manual sowie die deutschsprachige Einführung von Dominik Waßenhoven\fnurl{http://biblatex.dominik-wassenhoven.de/dtk.shtml}. -\section{Benutzung}\label{benutzung} - -\sty{biblatex-fiwi} wird wie alle anderen \sty{biblatex}"=Stile aufgerufen: - -\begin{ltxcode} -\usepackage[style=fiwi]{biblatex} -\end{ltxcode} -% -oder -% -\begin{ltxcode} -\usepackage[style=fiwi2]{biblatex} -\end{ltxcode} -% -Der Stil \sty{fiwi2} entspricht der Option \opt{yearatbeginning} (\secref{opt}); hier wird das Erscheinungsjahr unmittelbar nach dem Autor/Herausgeber in Klammern ausgegeben. - -\subsection{Paketoptionen}\label{opt} - -\sty{biblatex-fiwi} unterstützt alle gängigen Lade"=Optionen von \sty{biblatex}, bietet zusätzlich aber noch eigene an. Auch diese werden wie gewohnt aktiviert: -\begin{ltxcode} -\usepackage[bibstyle=fiwi,citestyle=fiwi,dashed=true]{biblatex} -\end{ltxcode} - -\begin{optionlist} - -\optitem[false]{actor}{\opt{true}, \opt{false}} -Aktiviert die Ausgabe der Schauspieler im Feld \bibfield{actor} bei Filmen (\secref{sub:filme}). - -\optitem[normal]{citefilm}{\opt{normal}, \opt{full}, \opt{complete}} - -Mit dieser Option wird die Ausgabe von Filmen bei Zitaten im Text definiert. Dies betrifft nur das Aussehen bei der Ernstnennung respektive den Befehl \cmd{citefullfilm} (\secref{zitbefehl}). Die Kurzform \opt{citefilm} entspricht \kvopt{citefilm}{normal}. - -\begin{valuelist} -\item[normal] Im Normalfall wird der volle Filmtitel und das Jahr der Veröffentlichung in Klammern ausgegeben; zB. \citefilm{Kubrick.S:1968}. -\item[full] Gibt den Filmtitel sowie -- in Klammern -- das Produktionsland und das Jahr der Veröffentlichung aus; zB. \toggletrue{citefullfilm}\citefullfilm{Kubrick.S:1968}.\togglefalse{citefullfilm} -\item[complete] Gibt den Filmtitel sowie -- in Klammern -- den deutschen Verleihtitel, Produktionsland und das Jahr der Veröffentlichung aus; zB. \toggletrue{citecompletefilm}\citefullfilm{Kubrick.S:1968}.\togglefalse{citecompletefilm} -\end{valuelist} - - - - -\boolitem[true]{citeprefix} - -Das korrekte Schreiben und Sortieren von Nachnamen mit Zusätzen wie <von> oder <van> ist eine Wissenschaft für sich. Im Deutschen gilt grundsätzlich folgende Regel: Ein Name wie »Ursula von Keitz« muss in der Bibliographie als »Keitz, Ursula von« erscheinen. Dies gilt aber nicht für Namen in anderen Sprachen; im Prinzip müssen hier jeweils die Regeln der Sprache des Herkunftslandes befolgt werden. Und streng genommen gibt es auch einen Unterschied zwischen der Deutschen »Ursula von Keitz« und dem Schweizer »Peter von Matt«. Im ersten Fall handelt es sich ursprünglich um einen Adelstitel, im zweiten Fall um einen Flurnamen, der eigentlich als »von Matt, Peter« in der Bibliographie stehen müsste. - -Steht unter \bibfield{name} einfach \opt{von Keitz, Ursula}, dann erfolgt die Ausgabe auch als »von Keitz, Ursula« und wird unter »von« einsortiert. Möchte man diese Ausgabe aber eine Einsortierung unter »Keitz«, dann müsste ein entsprechender Eintrag in das \bibfield{sortkey}"=Feld. - -Setzt man dagegen in das Feld \bibfield{options} den Eintrag \bibfield{useprefix=false}, dann lautet die Ausgabe »Keitz, Ursula von« und wird unter »Keitz« einsortiert. - -Unabhängig von diesem Feld lautet die Ausgabe im Text in jedem Fall standardmäßig »von Keitz« resp. »von Matt«. Für Zitate im Text wird \option{useprefix=false} also normalerweise ignoriert. Mit der Option \opt{nociteprefix} kann dies geändert werden, dann steht auch beim Zitat im Text nur noch »Matt« bzw. »Keitz«. Die Kurzform \opt{citeprefix} entspricht \kvopt{citeprefix}{true}. - -\boolitem[false]{dashed} - -Bei aufeinander folgenden identischen Autoren wird in der Bibliographie statt des Namens ein Spiegelstrich (--) gesetzt. Die Kurzform \opt{dashed} entspricht \kvopt{dashed}{true}. - -\boolitem[false]{filmruntime} - -Bestimmt, ob in der Bibliographie bei Filmen die in \bibfield{duration} resp. \bibfield{pagetotal} angegebene Laufzeit angegeben wird (vgl. \secref{sub:filme}). Die Kurzform \opt{filmruntime} entspricht \kvopt{filmruntime}{true}. - -\boolitem[false]{ibidpage} - -Steuert wie »ebd.« bei aufeinander folgenden Verweisen gehandhabt wird. Ist \cmd{ibidpage} auf \opt{true} gesetzt, wird bei identischem Autor, Titel und Seitenzahl nur »ebd.«, ausgegeben. Bei \opt{false} wird in jedem Fall die Seitenzahl ausgegeben. - -\optitem[false]{ignoreforeword}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} - -Bestimmt, ob der Inhalt von \bibfield{foreword} ausgegeben wird oder nicht. - -\begin{valuelist} -\item[true] Die Ausgabe von \bibfield{foreword} wird sowohl bei \cmd{fullcite} im Lauftext als auch in der Bibliographie unterdrückt. -\item[both] Ist mit \opt{true} identisch. -\item[false] \bibfield{foreword} wird überall ausgegeben. -\item[cite] Die Ausgabe von \bibfield{foreword} bei \cmd{fullcite} wird unterdrückt. -\item[bib] Die Ausgabe von \bibfield{foreword} in der Bibliographie wird unterdrückt. -\end{valuelist} -Die Kurzform \opt{ignoreforeword} entspricht \kvopt{ignoreforeword}{true} - -Diese Option kann innerhalb eines Dokuments mit den Befehlen \cmd{ignoreforewordtrue} und \cmd{ignoreforewordfalse} gesteuert werden. - -\optitem[false]{ignoreafterword}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} - -Bestimmt, ob der Inhalt von \bibfield{afterword} ausgegeben wird oder nicht. - -\begin{valuelist} -\item[true] Die Ausgabe von \bibfield{afterword} wird sowohl bei \cmd{fullcite} im Lauftext als auch in der Bibliographie unterdrückt. -\item[both] Ist mit \opt{true} identisch. -\item[false] \bibfield{afterword} wird überall ausgegeben. -\item[cite] Die Ausgabe von \bibfield{afterword} bei \cmd{fullcite} wird unterdrückt. -\item[bib] Die Ausgabe von \bibfield{afterword} in der Bibliographie wird unterdrückt. -\end{valuelist} -Die Kurzform \opt{ignoreafterword} entspricht \kvopt{ignoreafterword}{true} - -Diese Option kann innerhalb eines Dokuments mit den Befehlen \cmd{ignoreafterwordtrue} und \cmd{ignoreafterwordfalse} gesteuert werden. - -\optitem[false]{ignoreintroduction}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} - -Bestimmt, ob der Inhalt von \bibfield{introduction} ausgegeben wird oder nicht. - -\begin{valuelist} -\item[true] Die Ausgabe von \bibfield{introduction} wird sowohl bei \cmd{fullcite} im Lauftext als auch in der Bibliographie unterdrückt. -\item[both] Ist mit \opt{true} identisch. -\item[false] \bibfield{introduction} wird überall ausgegeben. -\item[cite] Die Ausgabe von \bibfield{introduction} bei \cmd{fullcite} wird unterdrückt. -\item[bib] Die Ausgabe von \bibfield{introduction} in der Bibliographie wird unterdrückt. -\end{valuelist} -Die Kurzform \opt{ignoreintroduction} entspricht \kvopt{ignoreintroduction}{true} - -Diese Option kann innerhalb eines Dokuments mit den Befehlen \cmd{ignoreintroductiontrue} und \cmd{ignoreintroductionfalse} gesteuert werden. - -\optitem[false]{ignoreaddendum}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} - -Bestimmt, ob der Inhalt von \bibfield{addendum} ausgegeben wird oder nicht. - -\begin{valuelist} -\item[true] Die Ausgabe von \bibfield{addendum} wird sowohl bei \cmd{fullcite} im Lauftext als auch in der Bibliographie unterdrückt. -\item[both] Ist mit \opt{true} identisch. -\item[false] \bibfield{addendum} wird überall ausgegeben. -\item[cite] Die Ausgabe von \bibfield{addendum} bei \cmd{fullcite} wird unterdrückt. -\item[bib] Die Ausgabe von \bibfield{addendum} in der Bibliographie wird unterdrückt. -\end{valuelist} -Die Kurzform \opt{ignoreaddendum} entspricht \kvopt{ignoreaddendum}{true} - -Diese Option kann innerhalb eines Dokuments mit den Befehlen \cmd{ignoreaddendumtrue} und \cmd{ignoreaddendumfalse} gesteuert werden. - -\optitem[false]{ignoreparatext}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} -Kombination der beiden vorhergehenden Befehle, der bestimmt, ob der Inhalt von \bibfield{foreword}, \bibfield{afterword}, \bibfield{introduction} und \bibfield{addendum} ausgegeben wird oder nicht. Die Kurzform \opt{ignoreparatext} entspricht \kvopt{ignoreparatext}{true} - -\boolitem[true]{ignorearticle} - -\bin{biber} bietet die Möglichkeit, Teile eines Felds beim Sortieren zu ignorieren. Mit \opt{ignorearticle} werden die gängigen Artikel bei den Feldern \bibfield{title} und \bibfield{maintitle} ignoriert (\secref{sub:sort}). Die Kurzform \opt{ignorearticle} entspricht \kvopt{ignorearticle}{true}. - -\boolitem[false]{isbn} - -Aktiviert die Ausgabe der Felder \bibfield{isbn/issn/isrn/isan}. - -\optitem[true]{mergedate}{\opt{maximum}, \opt{compact}, \opt{basic}, \opt{minimum}, \opt{true (=basic)}, \opt{false}} - -Bestimmt, wie kompakt die Datumsangabe in der Bibliographie ausfällt. Dies betrifft den Stil \sty{fiwi2} resp. die Option \opt{yearatbeginning}. Die Darstellungsweise weicht etwas von der \option{mergedate}-Option des Standard-Stils \opt{authoryear}. - -\begin{valuelist} -\item[false] Es wird strikt zwischen dem Zitationsjahr zu Beginn und der Datumsangabe am Ende unterschieden. - -Müller, Hans (2000): \emph{Buch}. Location 2000.\\ -Müller, Hans (2003a): \emph{Buch 2}. Location 2003.\\ -Müller, Hans (2003b): \emph{Buch 3}. Location: 2003.\\ -Müller, Hans (2006): »Artikel 1«. In: \emph{Monatliche Zeitschrift} Jg. 28, Nr. 5, Juni 2006, 70--85. -Müller, Hans (2007): »Artikel 2«. In: \emph{ Zeitschrift} Jg. 28, Nr. 5, Herbst 2007, 70--85. - -\item[minimum] Wenn das Zitationsjahr und die Datumsangabe identisch sind, werden sie zusammengezogen. Sobald sie sich unterscheiden, werden sie beide ausgegeben. - -Müller, Hans (2000): \emph{Buch}. Location.\\ -Müller, Hans (2003a): \emph{Buch 2}. Location 2003.\\ -Müller, Hans (2003b): \emph{Buch 3}. Location 2003.\\ -Müller, Hans (2006): »Artikel 1«. In: \emph{Monatliche Zeitschrift} Jg. 28, Nr. 5, Juni 2006, 70--85. -Müller, Hans (2007): »Artikel 2«. In: \emph{ Zeitschrift} Jg. 28, Nr. 5, Herbst 2007, 70--85. - -\item[basic] Funktioniert ähnlich wie \opt{minimum}, allerdings werden Jahre auch dann zusammengezogen, wenn \bibfield{extrayear}-Label generiert wird. - -Müller, Hans (2000): \emph{Buch}. Location.\\ -Müller, Hans (2003a): \emph{Buch 2}. Location.\\ -Müller, Hans (2003b): \emph{Buch 3}. Location.\\ -Müller, Hans (2006): »Artikel 1«. In: \emph{Monatliche Zeitschrift} Jg. 28, Nr. 5, Juni 2006, 70--85. -Müller, Hans (2007): »Artikel 2«. In: \emph{ Zeitschrift} Jg. 28, Nr. 5, Herbst 2007, 70--85. - -\item[compact] Funktioniert ähnlich wie \opt{minimum}, allerdings werden Jahre auch dann zusammengezogen, wenn \bibfield{extrayear}-Label generiert wird. - -Müller, Hans (2000): \emph{Buch}. Location.\\ -Müller, Hans (2003a): \emph{Buch 2}. Location.\\ -Müller, Hans (2003b): \emph{Buch 3}. Location.\\ -Müller, Hans (Juni 2006): »Artikel 1«. In: \emph{Monatliche Zeitschrift} Jg. 28, Nr. 5, 70--85. -Müller, Hans (2007): »Artikel 2«. In: \emph{ Zeitschrift} Jg. 28, Nr. 5, Herbst 2007, 70--85. - -\item[maximum] Funktioniert ähnlich wie \opt{minimum}, allerdings werden Jahre auch dann zusammengezogen, wenn \bibfield{extrayear}-Label generiert wird. - -Müller, Hans (2000): \emph{Buch}. Location.\\ -Müller, Hans (2003a): \emph{Buch 2}. Location.\\ -Müller, Hans (2003b): \emph{Buch 3}. Location.\\ -Müller, Hans (Juni 2006): »Artikel 1«. In: \emph{Monatliche Zeitschrift} Jg. 28, Nr. 5, 70--85. -Müller, Hans (Herbst 2007): »Artikel 2«. In: \emph{ Zeitschrift} Jg. 28, Nr. 5, 70--85. -\end{valuelist} - -Die Kurzform \opt{mergedate} entspricht \kvopt{mergedate}{true} - -\boolitem[false]{parensvolume} - -Setzt den Inhalte des Felds \bibfield{volume} in Klammern. - -\boolitem[false]{translatedas} - -Aktiviert die Ausgabe der deutschen Übersetzung am Ende des Eintrags, siehe dazu \secref{sub:germ}. Die Kurzform \opt{translatedas} entspricht \kvopt{translatedas}{true}.\footnote{In früheren Versionen hiess diese Option \opt{germ}.} - -\boolitem[false]{origyearsuperscript} -Ist diese Option aktiviert, wird bei Neuauflagen vor \bibfield{origdate} immer eine hochgestellte \textsuperscript{1} ausgegeben. Ansonsten geschieht dies nur bei Büchern. - -\optitem[false]{origyearwithyear}{\opt{true}, \opt{false}, \opt{brackets}} - -Mit dieser Option wird definiert, wie das Feld \bibfield{origdate} bei Neuauflagen ausgegeben wird. - -\begin{valuelist} -\item[false] \bibfield{origdate} wird nicht zusammen mit \bibfield{date} respektive \bibfield{year} ausgegeben, sondern bei Aufsätzen in Klammern unmittelbar nach dem Aufsatzitel und bei den übrigen Dokumenttypen am Ende des Eintrags in Klammern. -\item[true] \bibfield{origdate} wird unmittelbar nach der \bibfield{date} respektive \bibfield{year} ausgegeben; die beiden Felder sind durch einen Schrägstrich getrennt. -\item[brackets] \bibfield{origdate} wird ebenfalls unmittelbar nach der \bibfield{date} respektive \bibfield{year} ausgegeben, steht aber in eckigen Klammern. -\end{valuelist} - -\begingroup - \emergencystretch=3em % -Die verschiedenen Varianten von \opt{origyearwithyear} und \opt{origyearsuperscript} lassen sich frei kombinieren. -\par\endgroup -\opt{origyearwithyear} hat nur einen Einfluss auf die Darstellung von Neuauflagen und auf Übersetzungen; wenn das Feld \bibfield{origtitle} existiert, wird \bibfield{oridate} weiterhin mit den Angaben zum Original ausgegeben. - -\boolitem[false]{partofcited} Mit den \bibfield{crossref}- und \bibfield{xref}"=Feldern können in \sty{biblatex} Kinder- und Elterneinträge miteinander verknüpft werden; in der Regel sind dies Aufsätze und die entsprechenden Sammelbände. Die \opt{partofcited}"=Option sorgt dafür, dass bei der Ausgabe des Kindereintrages nicht die ganzen Angaben des Sammelbandes, sondern nur ein Verweis auf diesen ausgegeben wird; siehe dazu \secref{sub:kurz}. Die Kurzform \opt{partofcited} entspricht \kvopt{partofcited}{true}. - -\optitem[false]{pages}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}, \opt{both}} - -Diese Option steuert, ob bei vor die Seitenzahlen <S. > vorangestellt wird. Dabei können die Ausgabe im Lauftext und in der Bibliographie getrennt definiert werden. Mögliche Optionen sind: - -\begin{valuelist} -\item[true] Sowohl im Lauftext als auch in der Bibliographie steht <S. > vor der Seitenzahl. -\item[both] Ist mit \opt{true} identisch. -\item[false] Die Seitenzahlen werden ohne Zusatz ausgegeben. -\item[cite] Bei Zitaten im Lauftext werden die Seitenzahlen mit dem Zusatz <S. > ausgegeben. -\item[bib] In der Bibliographie werden die Seitenzahlen mit dem Zusatz <S. > ausgegeben. -\end{valuelist} - -\boolitem[false]{publisher} - -Bestimmt, ob in der Bibliographie der Verlag -- respektive bei Übersetzungen der Verlag des Originals -- ausgegeben wird. Die Kurzform \opt{publisher} entspricht \kvopt{publisher}{true}. - -Diese Option kann innerhalb eines Dokuments mit den Befehlen \cmd{ignorepublishertrue} und \cmd{ignorepublisherfalse} gesteuert werden. Zusätzlich gibt es noch die Befehle \cmd{ignoreaddresstrue} und \cmd{ignoreaddressfalse} respektive \cmd{ignorelocationtrue} und \cmd{ignorelocationfalse}, die die Ausgabe des Verlagortes steuern. - -\optitem[false]{script}{\opt{true}, \opt{false}} -Aktiviert die Ausgabe der Drehbuchautoren im Feld \bibfield{scriptwriter} resp. \bibfield{editor} bei Filmen (\secref{sub:filme}). - -\boolitem[false]{series} - -Bestimmt, ob in der Bibliographie die Reihe, in der der zitierte Titel erschienenen ist, ausgegeben wird. Die Kurzform \opt{publisher} entspricht \kvopt{publisher}{true}. - -\boolitem[false]{yearatbeginning} - -Während im Normalfall das Jahr am Ende des Eintrags ausgegeben wird, steht es mit der aktivierten Option \opt{yearatbeginning} nach dem Autor/Herausgeber zu Beginn in Klammern. Diese Option entspricht dem Aufruf des Stils \sty{fiwi2} (\secref{benutzung}). Die Kurzform \opt{yearatbeginning} entspricht \kvopt{yearatbeginning}{true}. - -\boolitem[false]{xindy} - -Standardmäßig aktiviert \sty{biblatex-fiwi} die Option \opt{indexing=cite}, das heißt, \sty{biblatex} schreibt bei allen \cmd{cite}-Befehlen einen Index-Eintrag in die \file{.idx}"=Datei. Dieser Eintrag hat normalerweise folgende Form -\begin{ltxcode} -\indexentry{Index-Eintrag@Index-Eintrag}{Seitenzahl}. -\end{ltxcode} -% -Der zweite Teil des Eintrags nach dem @-Zeichen zeigt dem Programm \sty{makeindex} an, wie der Eintrag sortiert werden muss und kann bei Bedarf über das Feld \bibfield{indextitle} definiert werden (ist \bibfield{indextitle} nicht definiert, wird \bibfield{title} verwendet). Das weitaus mächtigere Index"=Programm \bin{xindy}\fnurl{http://xindy.sourceforge.net/} ermöglicht viel komplexere Sortiervorgänge und benötigt den zweiten Teil des Index"=Eintrags nicht -- im Gegenteil: Dieser macht die Verarbeitung mit \bin{xindy} viel aufwendiger. Die Option \opt{xindy} unterbindet deshalb, dass der zweite Teil ausgegeben wird; der Eintrag in die \sty{.idx}"=Datei sieht dann folgendermaßen aus: - -\begin{ltxcode} -\indexentry{Index-Eintrag}{Seitenzahl}. -\end{ltxcode} -% -In diesem Fall hat das Feld \bibfield{indexsorttitle} auch keinen Einfluss auf den Index"=Eintrag. Die Kurzform \opt{xindy} entspricht \kvopt{xindy}{true}. Wie beim \cmd{citefilm}-Befehl überprüft \sty{biblatex-fiwi}, ob es mehrere Filme gleichen Titels gibt. Ist dies der Fall, wird automatisch das Jahr im Index angegeben. - -In jedem Fall muss die Index"=Erzeugung mittels einem Paket wie \sty{makedidx} oder \sty{imakedidx} sowie dem Befehl \cmd{makeindex} aktiviert werden. -\end{optionlist} - -%\subsection{Optionen für die Bibliography}\label{check} -% -%\sty{biblatex-fiwi} stellt Filter für die Bibliographie bereit, die beim Aufrufen des Befehls \cmd{printbibliography} eingesetzt werden können. Die Filter entsprechen den gleichnamigen Paketoptionen (\secref{opt}). -% -%\begin{ltxcode} -%\printbibliography[check=<<Filter>>] -%\end{ltxcode} -% -%\begin{keymarglist} -%\item[ignoreforeword] -%Bestimmt, ob der Inhalt von \bibfield{foreword} ausgegeben wird oder nicht. -% -%\item[ignoreafterword] -%Bestimmt, ob der Inhalt von \bibfield{afterword} ausgegeben wird oder nicht. -% -%\item[ignoreintroduction] -%Bestimmt, ob der Inhalt von \bibfield{introduction} ausgegeben wird oder nicht. -% -%\item[ignoreparatext] -%Kombination der beiden vorhergehenden Filter, der bestimmt, ob der Inhalt von \bibfield{foreword}, \bibfield{afterword} und \bibfield{introduction} ausgegeben wird oder nicht. -% -%\item[printpublisher] -%Bestimmt unabhängig von der globalen Option \opt{publisher}, ob in der Bibliographie der Verlag -- respektive bei Übersetzungen der Verlag des Originals -- ausgegeben wird. -% -%\item[ignorepublisher] -%Bestimmt unabhängig von der globalen Option \opt{publisher}, ob in der Bibliographie der Verlag -- respektive bei Übersetzungen der Verlag des Originals -- ausgegeben wird. -% -%\item[ignoreaddress] -%Bestimmt unabhängig, ob in der Bibliographie der Verlagsort -- respektive bei Übersetzungen der Verlagsort des Originals -- ausgegeben wird. -% -%\end{keymarglist} - -\section{Befehle} -\label{bas} - -\subsection{Zitierbefehle} -\label{zitbefehl} - -\sty{biblatex-fiwi} unterstützt alle gängigen \sty{biblatex}"=Befehle. Auch die \cmd{footcite}"=Befehle sollten grundsätzlich funktionieren. Da es sich bei \sty{biblatex-fiwi} aber um ein Format für Zitate im Lauftext handelt, ist deren Einsatz wenig sinnvoll und wird von mir auch nicht getestet. - -\begin{ltxsyntax} -\cmditem{inparencite}{key} - -Neben den normalen \sty{biblatex}"=Befehlen unterstützt \sty{biblatexf-fiwi} den durch den \sty{biblatex"=luh"=ipw}"=Stil\fnurl{http://www.tex.ac.uk/ctan/macros/latex/exptl/biblatex-contrib/biblatex-luh-ipw/} eingeführten \cmd{inparencite}"=Befehl. Dieser ähnelt dem Befehl \cmd{parencite}, erlaubt aber Zitatangaben im Fließtext nach dem Schema \enquote{Wie \inparencite[28]{Lavery.D:2008a} erläutert}. Im Gegensatz zu den meisten anderen Zitierbefehlen, wird bei \cmd{inparencite} eine Zitatwiederholung nicht durch \enquote{ebd.} ersetzt. - -\end{ltxsyntax} - -\noindent Neben den Standardbefehlen bietet \sty{biblatex-fiwi} zudem noch spezielle Befehle für das Zitieren von Filmen für die Dokumenttypen \bibtype{movie}, \bibtype{video} und \bibtype{misc} (siehe auch\secref{supp:types}): - -\begin{ltxsyntax} - -\cmditem{citefilm}{key} - -Zum Zitieren von Filmen. Die Form des Zitates hängt von der Option \opt{citefilm} ab (\secref{opt}). Im Normalfall werden der volle Titel und das Jahr ausgegeben, zB.: \citefilm{Kubrick.S:1975}. Bei allen weiteren Nennungen wird nur das Feld \sty{shorttitle} (falls vorhanden) resp. \sty{title} ausgegeben, zB: \citefilm{Kubrick.S:1975}. Existieren zwei Filme mit dem gleichen Titel, wird auch bei späteren Nennungen des Films das Jahr in Klammern ausgegeben, so dass der Film eindeutig identifiziert werden kann (das Gleiche geschieht auch beim Index-Eintrag). - -\cmditem{citefullfilm}{key} - -Gibt immer die kompletten Angaben zum Film aus, auch wenn der Film bereits zitiert wurde, die Form der Ausgabe hängt von der Option \sty{citefilm} ab. - -\cmditem{citecfilm}{key} - -Gibt -- unabhängig von der Option \sty{fullcitefilm} -- den vollen Filmtitel sowie Produktionsland und -jahr aus; zB.: \citecfilm{Kubrick.S:1975}. -\end{ltxsyntax} - -\subsection{Weitere Befehle} -\begin{ltxsyntax} -\cmditem{film}{text} - -Dieser Befehl markiert Filmtitel und ist standardmäßig auf \cmd{textsc}, also auf Kapitälchen, eingestellt. -\end{ltxsyntax} - -\section{Unterstütze Dokumenttypen}\label{supp:types} - -\sty{biblatex} unterstützt eine Fülle von Dokumenttypen, von denen man -- je nach Wissenschaftsgebiet -- in der Praxis allerdings nur einen Bruchteil tatsächlich einsetzt. \sty{biblatex-fiwi} bietet nur für Dokumenttypen, die im geisteswissenschaftlichen Bereich relevant sind, spezifische Anpassungen. Alle nicht unterstützen Typen sind mir in der Praxis bislang nicht begegnet; bei Bedarf können in späteren Versionen aber weitere Dokumenttypen hinzukommen. - -In der folgenden Liste sind die Dokumenttypen, für die \sty{biblatex-fiwi} spezielle Anpassungen mitbringt, aufgeführt und allfällige Besonderheiten beschrieben. Typen, die nicht in der Liste stehen, können dennoch eingesetzt werden -- \sty{biblatex-fiwi} bietet für sie einfach keine besonderen Anpassungen. - -\begin{typelist} - -\typeitem{article} -Entspricht dem normalen \sty{biblatex}"=Typ. Besonderes Augenmerk liegt auf Kombinationen von \bibfield{volume}, \bibfield{number}, \bibfield{issue} und \bibfield{issuetitle}. - -\typeitem{periodical} -Entspricht dem normalen \sty{biblatex}"=Typ. - -\typeitem{book} -Entspricht dem normalen \sty{biblatex}"=Typ. Besonderes Augenmerk liegt auf mehrbändigen Werken mit \bibfield{title}, \bibfield{maintitle}, \bibfield{parttitle} u.a. sowie auf Kombinationen von Autoren, Herausgeber nund Bearbeitern. - -\typeitem{incollection/inbook} - -Die Unterscheidung dieser beiden Typen hat mir nie eingeleuchtet. Zumindest ist mir bislang noch kein Fall begegnet, bei dem sie mir sinnvoll erschienen wäre. Deshalb werden die beiden Dokumenttypen von \sty{biblatex-fiwi} gleich behandelt. - -\typeitem{online} - -Entspricht dem normalen \sty{biblatex}"=Typ. - -\typeitem{movie, video,misc} - -Diese drei Typen werden alle für Filme verwendet, wobei \bibtype{movie} und \bibtype{video} gleich behandelt werden sollten; \bibtype{misc} ist eher ein historisches Überbleibsel. Die Standardfelder haben bei diesen Dokumenttypen eine leicht andere Bedeutung als normal (siehe dazu \secref{sub:filme} und \secref{zitbefehl}). - -\typeitem{thesis} -Entspricht dem normalen \sty{biblatex}"=Typ. - -\typeitem{phdthesis} -Entspricht dem normalen \sty{biblatex}"=Typ. - -\typeitem{collection, reference} -Diese beiden Typen sind für Nachschlagewerke gedacht. In der Bibliographie wird zuerst der Name des Buches ausgegeben und anschließend die Autoren oder Herausgeber. Die Sortierung erfolgt anhand des Titels. - -\typeitem{review} -Dieser Typ ist für Rezensionen gedacht. In den Standard"=Stilen von \sty{biblatex} ist \bibtype{review} mit \bibtype{article} identisch, \sty{biblatex-fiwi} dagegen stellt eine spezielle Anpassung zur Verfügung, bei der die Rezension mit dem Eintrag des rezensierten Werks verknüpft wird. Dabei wird das rezensierte Werk im Feld \bibfield{related} angegeben, eine Angabe von \bibfield{title} ist fakultativ (\secref{sub:rezis}). -\end{typelist} - -\subsection{Zusätzliche Felder}\label{sub:zusatzfeld} - -\sty{biblatex} stellt eine Reihe von Feldern bereit, um das Erscheinungsjahr der Erstausgabe oder -- bei Übersetzungen -- das Original anzugeben. In den Standard"=Stilen wird nur das \bibfield{origlanguage}"=Feld unterstützt. \sty{biblatex-fiwi} dagegen nutzt alle \bibfield{orig*}"=Felder; siehe dazu auch die Beispiele in \secref{beisp} (Alternativ kann hierfür auch der \bibfield{related}-Mechanismus eingesetzt werden \secref{sub:uebersetzungen}). Ausserdem wird \bibfield{nameaddon} unterstützt. - -\begin{fieldlist} - -\fielditem{origdate}{date} -Das Datum -- normalerweise nur das Jahr -- der Erstveröffentlichung respektive des Originals im Falle einer Übersetzung. Bei Aufsätzen, bei denen es sich nicht um Übersetzungen handelt, wird dieses Datum unmittelbar nach \bibfield{title} in Klammern ausgegeben, bei Büchern, die keine Übersetzungen sind, dagegen am Ende des Eintrags in Klammern mit einer hochgestellten \textsuperscript{1}. Handelt es sich um eine Übersetzung -- ist der \bibfield{origtitle} angegeben -- erfolgt die Ausgabe zusammen mit den Angaben zum Original ebenfalls am Ende des Eintrags in Klammern. - -\fielditem{origlanguage}{key} -Die Sprache des Originals. Normalerweise wird dieses Feld gemeinsam mit \bibfield{translator}, \bibfield{origtitle}, \bibfield{origdate} und \bibfield{origlocation} angegeben, keine dieser Angaben ist aber zwingend nötig. - -\fielditem{origtitle}{literal} -Bei Übersetzungen der Titel des Originals. Wenn dieses Feld leer ist, werden auch \bibfield{origlocation} und \bibfield{origpublisher} nicht angegeben und \bibfield{origyear} nur mit einer hochgestellten \textsuperscript{1}. - -\listitem{origlocation}{literal} -Bei Übersetzungen der Publikationsort des Originals. Wird nur ausgegeben, wenn \bibfield{origtitle} nicht leer ist. - -\listitem{origpublisher}{literal} -Bei Übersetzungen der Verlag des Originals. Wie \bibfield{publisher} wird die Ausgabe über die Option \opt{publisher} gesteuert (\secref{opt}). Wird nur ausgegeben, wenn \bibfield{origtitle} nicht leer ist. - -\fielditem{nameaddon}{literal} -Dient zur Angabe von Pseudonymen und ähnlichem bei Autoren und Herausgebern; der Inhalt dieses Feldes wird unverändert unmittelbar nach dem Namen in eckigen Klammern ausgegeben. - -\textbf{Achtung}: Sollte \bibfield{author} respektive \bibfield{editor} mehrere Namen enthalten, kann \sty{biblatex} nicht wissen, zu welchem Autor die Angabe in \bibfield{nameaddon} gehört (und es ist auch nicht möglich, mehreren Autoren unterschiedliche \bibfield{nameaddons} zuzuweisen); deshalb gibt \sty{biblatex"=fiwi} den Inhalt von \bibfield{nameaddon} in diesem Fall ebenfalls hinter den Namen aus. Für die Praxis bedeutet das, dass \bibfield{nameaddon} eigentlich nur bei Dokumenten mit einem einzigen Autor sinnvoll eingesetzt werden kann. - -\fielditem{parttitle}{literal} -Dient für den -- zugegebenermaßen nicht sehr häufigen -- Fall eines Bandes eines mehrbändigen Werks, das innerhalb einer Werkausgabe o.\,ä. erscheint. - -\begin{ltxexample} -@book{Cassirer.E:2010c, - Author = {Cassirer, Ernst}, - Editora = {Clemens, Julia}, - Editoratype = {redactor}, - Location = {Hamburg}, - Maintitle = {Gesammelte Werke}, - Number = {609}, - Origdate = {1929}, - Part = {3}, - <<Parttitle = {Phänomenologie der Erkenntnis},>> - Publisher = {Meiner}, - Series = {Philosophische Bibliothek}, - Title = {Philosophie der symbolischen Formen}, - Volume = {13}, - Year = {2010}} -\end{ltxexample} -\fullcite{Cassirer.E:2010c} - -\textbf{Achtung}: \bibfield{parttitle} ist ein Zusatz von \sty{biblatex-fiwi}, der von keinem anderen Stil unterstützt wird. -\end{fieldlist} - - - - - -\subsection{Filme}\label{sub:filme} - -Filme werden mit den \cmd{citefilm}"=Befehlen zitiert (siehe \secref{zitbefehl}). Da \bibtex ursprünglich nicht für audiovisuelle Medien vorgesehen war, fehlen in den Standardtypen spezielle Felder. Bei \sty{biblatex-fiwi} kamen hierfür zu Beginn Standardfelder wie \bibfield{author} oder \bibfield{pagetotal} zum Einsatz, mittlerweile gibt es aber spezielle Felder mit passenden Namen. In der Funktionalität unterscheiden sich die Felder nicht; zu beachten ist einzig, dass Felder wie \bibfield{director} oder \bibfield{scriptwriter} spezifisch für \sty{biblatex-fiwi} sind, andere \sty{biblatex}-Stile können mit ihnen somit nichts anfangen. Da aber ohnehin kaum ein anderer Stil das Zitieren von audiovisuellen Medien so umfassend unterstützt, spielt das auch keine große Rolle. - -\begin{fieldlist} - -\listitem{director, author}{name} -Der Regisseur des Films. - -\listitem{scriptwriter/editor}{name} -Die Drehbuchautoren Films, wird nur ausgegeben, wenn \opt{script} aktiviert ist (vgl. \secref{opt}). - -\listitem{actor}{name} -Die Darsteller des Films, wird nur ausgegeben, wenn \opt{actor} aktiviert ist (vgl. \secref{opt}). - -\listitem{address, location}{literal} -Das Produktionsland. - -\fielditem{title}{literal} -Der internationale Verleihtitel. - -\fielditem{subtitle}{literal} -Der deutsche Verleihtitel. - -\fielditem{duration, pagetotal}{literal} -Die Laufzeit des Films in Minuten, wird nur ausgegeben, wenn \opt{filmruntime} aktiviert ist (vgl. \secref{opt}). Die Einheit, in der die Laufzeit angegeben wird, kann über \bibfield{durationtype} bestimmt werden. - -\fielditem{durationtype}{key} - -Normalerweise wird die Laufzeit eines Films in Minuten angegeben; bei Stummfilmen ist es allerdings üblich, die Länge in Metern zu vermerken. Der Wert dieses Feldes bestimmt die Ausgabe in der Filmographie, wenn \opt{filmruntime} aktiviert ist (vgl. \secref{opt}). Mögliche Werte sind \texttt{minute} (Standard) und \texttt{meter}. - -\listitem{note}{literal} -Angaben zur zitierten DVD o.ä.; wird, falls vorhanden, unverändert am Ende des Eintrags in Klammern ausgegeben. - -\end{fieldlist} - -\subsection{Alternative Filmtitel}\label{alternatetitle} - -Für Filme, die zwei gebräuchliche internationale Verleihtitel haben, gibt es das Feld \bibfield{alternattitle}. Ist dieses Feld vorhanden , wird es in der Filmographie sowie bei der ersten Nennung im Text automatisch ausgegeben. Ist \opt{xindy} aktiviert, wird zudem ein Index"=Eintrag für \bibfield{alternatetitle} erstellt, das auf \bibfield{title} verweist. - -Falls der alternative Verleihtitel in einem Alphabet ausgegeben werden muss, das von der Hauptschrift des Dokuments nicht unterstützt wird (z.B. Kyrillisch oder Griechisch), kann dieses im Feld \bibfield{alternattitlescript} angegeben werden. Ist dieses Feld vorhanden, steht automatisch das Makro \sty{altscript:\prm{alternatetitlescript}-font} zur Verfügung. Dieses wird bei der Ausgabe von \bibfield{alternattitle} ausgeführt und kann entsprechend so definiert werden, dass eine passende Schrift geladen wird. -% -\begin{ltxexample} -@movie{Protazanov.Y:1924, - Address = {SU}, - <<Alternatetitle = Аэлита,>> - <<Alternatetitlescript = {cyrillic}, >> - Author = {Protazanov, Yakov}, - Read = {Yes}, - Title = {Aelita}, - Year = {1924}} -\end{ltxexample} -% -In diesem Beispiel steht das Makro \sty{altscript:cyrillic-font} bereit,\footnote{Das in dem Beispiel bei Аэлита die geschweiften Klammern fehlen, liegt daran, dass ich es noch nicht geschafft habe, die für diese Dokumentation verwendete Dokumentklasse vollständig mit nichtlateinischen Schriften zum Laufen zu bringen.} das in \luatex z.B. folgendermaßen definieren kann (der Befehl \cmd{newbibmacro*} ist Teil von\sty{biblatex} und kann somit erst nach dem Laden des Pakets verwendet werden): - -\begin{ltxcode} -\newbibmacro*{altscript:cyrillic-font}[1]% -{\newfontfamily\cyrfont[]{Linux Libertine}{\cyrfont{\textsc{#1}}}} -\end{ltxcode} -% -Das Ergebnis sieht dann wie folgt aus: \citefilm{Protazanov.Y:1924}. - -\subsection{Serien}\label{sub:serien} - -\sty{biblatex-fiwi} stellt sowohl Zitierstile für Filme als auch für Fernsehserien bereit; bei Fernsehserien werden zwei Varianten unterschieden: - -\subsubsection*{Zitieren einer einzelnen Folge} -In diesem Fall bleibt die Bedeutung der bisherigen Felder gleich; es kommen allerdings neue hinzu: - -\begin{fieldlist} -\fielditem{maintitle}{literal} -Der Titel der Serie; für den Titel der zitierten Folge wird \bibfield{title} verwendet. - -\fielditem{volume}{literal} -Die Staffel der zitierten Folge. - -\fielditem{volume}{number} -Die Nummer der zitierten Folge innerhalb der Staffel. -\end{fieldlist} -% -\begin{ltxexample} -@movie{Reardon.J:1994a, - Author = {Reardon, Jim}, - Location = {USA}, - Maintitle = {The Simpsons}, - Number = {6}, - Rating = {5}, - Title = {Treehouse of Horror V}, - Volume = {6}, - Year = {1994}} -\end{ltxexample} -\fullcite{Reardon.J:1994a}. -\\ \\ -\noindent Um Fernsehserien innerhalb des Textes zu zitieren, gibt es zwei verschiedene Befehle: Mit \cmd{citefilm} wird der Titel der Serie (also \bibfield{maintitle}), die Angaben zu Staffel und Folge, sowie der Titel der spezifischen Folge und das Jahr ausgegeben. Bei \cmd{citeepisode} dagegen werden nur der Titel der Folge (also \bibfield{title}) und das Jahr ausgegeben. - -\subsubsection*{Zitieren einer ganzen Serie} -Wenn eine ganze Serie und nicht eine einzelne Folge zitiert werden soll, gelten andere Anforderungen; so ist nun der Sender, der die Serie ursprünglich ausgestrahlt hat, oft wichtiger als das Land. Dagegen sind die Regisseure der Sendung weniger wichtig als ihre <Erfinder> . Als Zitierbefehle kommen weiterhin die Befehle \cmd{citefilm} und \cmd{citefullfilm} zum Einsatz. Um anzuzeigen, dass es sich bei dem zitierten Film um eine ganze Serie handelt, wird das Feld \bibfield{entrysubtype} auf \prm{serial} gesetzt. Zudem werden einige bestehende Felder nun anders verwendet. - -\begin{fieldlist} -\item[entrysubtype] -Um eine ganze Serie zu zitieren, muss in diesem Feld \prm{serial} stehen. - -\item[organization] -Der Fernsehsender, der die Sendung zuerst ausgestrahlt hat. - -\item[title] -Ist \bibfield{entrysubtype} auf \prm{serial} gesetzt, wird hier der Name der Serie angegeben und nicht der der Folge. - -\item[author] -Wird hier für den Schöpfer/Erfinder der Serie verwendet. -\end{fieldlist} - -\begin{ltxexample} -@movie{Ball.A:2003a, - Author = {Ball, Alan}, - Date = {2003/}, - Entrysubtype = {serial}, - Location = {USA}, - Organization = {HBO}, - Title = {True Blood}} -\end{ltxexample} -\fullcite{Ball.A:2003a} - -\subsection{Zitieren von Fernsehsendungen}\label{movie:tv} - -Im Gegensatz zum vorangegangen Kapitel geht es hier um das Zitieren einer zu einem bestimmten Zeitpunkt ausgestrahlten Sendung. In der Regel handelt es sich dabei gerade nicht um Filme, Serien o.ä., sondern um die Eigenproduktionen -- meist Infomations- oder Live"=Sendungen -- eines Senders. - -Fernsehsendungen wie z.\,B.\ Talkshows oder Nachrichtensendungen haben keinen Regisseur im eigentlichen Sinn, dafür aber ein präzises Ausstrahlungsdatum. Statt des Landes wird hier der Fernsehsender angegeben. -\begin{fieldlist} -\fielditem{entrysubtype}{literal} -Um eine Sendung zu zitieren, muss in diesem Feld \prm{tv} stehen. - -\fielditem{organization}{literal} -Der Fernsehsender, auf dem die Sendung ausgestrahlt wurde. - -\fielditem{date}{date} -Das Datum der Ausstrahlung. - -\fielditem{maintitle}{literal} -Handelt es sich um ein wiederkehrendes Format, bei dem die einzelnen Folgen eigene Titel haben, wird hier der Name der Sendung angegeben. - -\fielditem{title}{literal} -Handelt es sich um ein wiederkehrendes Format, bei dem die einzelnen Folgen eigene Titel haben, wird hier der Name zitieren Folge angegeben. Tragen die einzelnen Folgen dagegen keinen Namen, bleibt \bibfield{maintitle} leer und der Name der Sendung wird mit \bibfield{title} angegeben. -\end{fieldlist} -% -\begin{ltxexample} -@movie{Kassensturz:2012-05-12, - Date = {2012-05-12}, - Entrysubtype = {tv}, - Organization = {SF1}, - Pagetotal = {23}, - Title = {Kassensturz}, - Year = {2012}} -\end{ltxexample} -\fullcite{Wuergel.H:2012d}. -\\ \\ -\noindent Auch hier gibt es die Möglichkeit den Titel der Sendung und jenen der spezifischen Folge mit \cmd{citefilm} zu zitieren oder mittels \cmd{citeepisode} nur den Titel der gewünschten Folge. - -Für den Fall, dass verschiedene Ausgaben einer Sendung zitiert werden, bei der eine einzelne Folge keinen eigenen Titel hat (man danke an \film{Tagesschau}, \film{Sportstudio} oder dergleichen) wird das Ausstrahlungsdatum der Sendung auch bei Folgezitaten ausgegeben. Werden also zum Beispiel \citefilm{Wuergel.H:2012d} und \citefilm{Wuergel.H:2012b} zitiert, so so sieht ein Wiederholungszitat folgedermaßen aus: \citefilm{Wuergel.H:2012d}. - -\subsection{Sortieren von Filmen}\label{sub:sort} - -Filme werden normalerweise in einer gesonderten Filmographie aufgeführt. Da \sty{biblatex} die Möglichkeit bietet, mehrere Bibliographien auszugeben, kann auf einfache Weise eine Filmographie erstellt werden: - -\begin{ltxexample} -\documentclass{...} -\usepackage{biblatex} -\addbibresource{...} -\begin{document} -... -\printbibheading -<<\defbibfilter{film}{% - ( type=misc or type=movie or type=video)}>> -\printbibliography[<<nottype=movie,nottype=video,nottype=misc>>, - heading=subbibliography, title={Literatur}] -\printbibliography[<<filter=film>>,heading=subbibliography, - title={Filmographie}] -\end{document} -\end{ltxexample} -% -Normalerweise werden Filmographien nicht nach dem Namen des Regisseurs, sondern nach dem Titel des Films geordnet. Seit Version 2.0 bietet \sty{biblatex} die Möglichkeit, das Sortier"=Schema nicht nur global, sondern gesondert für jede Bibliographie zu setzen. \sty{biblatex-fiwi} bietet zusätzlich zu den Standard"=Schemata noch das Sortierschema \opt{title}, das ausschliesslich nach Titeln ordnet: - -\begin{ltxexample} -\printbibliography[type=movie,video,<<sorting=title>>] -\end{ltxexample} -% - Bei einzelnen Folgen von Fernsehserien wird zuerst nach \bibfield{maintitle} und anschließend nach \bibfield{title} sortiert.\footnote{In früheren Versionen wurde mittels \cmd{DeclareSortExclusion} das Sortieren nach Autoren, Herausgebern etc. für \bibtype{misc,movie} und \bibtype{video} generell deaktiviert. Dies ist nun nicht mehr der Fall. Das kann zur Folge haben, dass bestehende Dokumente angepasst werden müssen.} - -Zudem bietet \bin{biber} die Möglichkeit, beim Sortieren von Filmtiteln die Artikel zu ignorieren, so dass beispielsweise \textsc{The Godfather} unter <G> eingeordnet wird. Standardmäßig werden bei \sty{biblatex-fiwi} so die gängigen Artikel in den Feldern \bibfield{title} und \bibfield{maintitle} ignoriert. Mit der Option \opt{ignorearticle=false} kann diese Funktion deaktiviert werden. Wenn alle Stricke reißen, kann man am Ende immer noch auf die Felder \bibfield{sorttitle} respektive \bibfield{sortkey} ausweichen. - -\section{Verbundene Einträge}\label{sub:verbund} - -Seit Version 2.0 bietet \sty{biblatex} die Möglichkeit, zwei Einträge miteinander zu verknüpfen. Dabei wird im Feld \bibfield{related} der Citekey des verknüpften Eintrags und im Feld \bibfield{relatedtype} die Art der Verbindung angegeben. Mit \sty{biblatex-fiwi} sind verschiedene Varianten von Verknüpfungen möglich. - -\subsection{Übersetzungen und Neuauflagen}\label{sub:uebersetzungen} - -Übersetzungen und Neuauflagen können nicht nur mittels den \bibfield{orig*}-Feldern (\secref{sub:zusatzfeld}), sondern auch über verknüpfte Einträge angegeben werden. - -Diese beiden Einträge -\begin{ltxexample} -@book{Todorov.T:1970, - Author = {Todorov, Tzvetan}, - Location = {Paris}, - Publisher = {Éditions du Seuil}, - Title = {Introduction à la littérature fantastique}, - Year = {1970}} - -@book{Todorov.T:1992, - Author = {Todorov, Tzvetan}, - Location = {Frankfurt a. M.}, - Origlanguage = {french}, - Publisher = {Fischer}, - <<Related = {Todorov.T:1970}, - Relatedtype = {translationof},>> - Title = {Einführung in die fantastische Literatur}, - Translator = {Kersten, Karin and Metz, Senta and Neubaur, Caroline}, - Year = {1992}} -\end{ltxexample} -% -führen zur gleichen Ausgabe wie dieser: - -\begin{ltxexample} -@book{Todorov.T:1992, - Author = {Todorov, Tzvetan}, - Location = {Frankfurt a. M.}, - <<Origdate = {1970}, - Origlanguage = {french}, - Origlocation = {Paris}, - Origpublisher = {Éditions du Seuil}, - Origtitle = {Introduction à la littérature fantastique},>> - Publisher = {Fischer}, - Title = {Einführung in die fantastische Literatur}, - Translator = {Kersten, Karin and Metz, Senta and Neubaur, Caroline}, - Year = {1992}} -\end{ltxexample} -% -\fullcite{Todorov.T:1992}\\ - -\noindent Welche Variante man im konkreten Fall wählt, ist nur eine Frage des persönlichen Geschmacks respektive der Bequemlichkeit.\\ - -\noindent Analog funktioniert \bibfield{related} auch bei Neuauflagen. Diese beiden Einträge -\begin{ltxexample} -@book{Bordwell.D:1979a, - Author = {Bordwell, David and Thompson, Kristin}, - Location = {Reading}, - Publisher = {Addison-Wesley}, - Title = {Film Art: An Introduction}, - Year = {1979}} - -@book{Bordwell.D:2004a, - Author = {Bordwell, David and Thompson, Kristin}, - Edition = {7}, - Location = {Boston and Burridge and Dubuque and Madison and New York}, - Publisher = {McGraw-Hill}, - <<Related = {Bordwell.D:1979a}, - Relatedtype = {origpubin},>> - Title = {Film Art: An Introduction}, - Year = {2004}} -\end{ltxexample} -% -führen zur gleichen Ausgabe wie dieser: -\begin{ltxexample} -@book{Bordwell.D:2004a, - Author = {Bordwell, David and Thompson, Kristin}, - Edition = {7}, - <<Origdate = {1979},>> - Location = {Boston and Burridge and Dubuque and Madison and New York}, - Publisher = {McGraw-Hill}, - Title = {Film Art: An Introduction}, - Year = {2004}} -\end{ltxexample} -\fullcite{Bordwell.D:2004a}\\ - -\noindent Wie man an diesem Beispiel sieht, lohnt sich die Verknüpfung bei Neuauflagen in der Regel nicht. Die Funktion ist vor allem dann nützlich, wenn man -- aus welchen Gründen auch immer -- ohnehin zwei verschiedene Varianten einer Publikation bibliographiert hat. - -\subsection{Deutsche Übersetzungen}\label{sub:germ} - -Über den gleichen Mechanismus kann bei einer fremdsprachigen Publikation die deutsche Übersetzung angegeben werden: Dazu kommt die Option \opt{translatedas} (siehe \secref{opt}) in Kombination mit den Feldern \bibfield{related} und \bibfield{relatedtype} zum Einsatz.\footnote{In früheren Versionen hiess diese Option \opt{germ} wurde in Kombination mit dem \bibfield{usera} benutzt; dieses wird nun nicht mehr unterstützt. Alte .bib-Dateien müssen entsprechend angepasst werden.} Diese Funktion habe ich für ein eigenes Buchprojekt geschrieben, im Normalfall dürfte sie kaum benötigt werden (in wissenschaftlichen Arbeiten ist es üblich, bei Übersetzungen das fremdsprachige Original anzugeben. Der gegenteilige Fall kommt dagegen kaum vor). Dabei wird ein Eintrag mittels Angabe des Citekeys in \bibfield{related} mit dem Eintrag, der die Übersetzung enthält, verknüpft und in \bibfield{relatedtype} die Art der Verknüpfung angegeben -- in diesem Fall \opt{translatedas} -- angegeben: - -\begin{ltxexample} -@incollection{Poe.E:1982c, - Author = {Poe, Edgar Allan}, - Bookauthor = {Poe, Edgar Allan}, - Booktitle = {The Complete Tales and Poems of Edgar Allan Poe}, - Location = {London and New York}, - Origdate = {1843}, - Pages = {223--230}, - Title = {The Black Cat}, - <<Related = {Poe.E:1999a}, - Relatedtype = {translatedas},>> - Year = {1982}} - -@incollection{Poe.E:1999a, - Author = {Poe, Edgar Allan}, - Bookauthor = {Poe, Edgar Allan}, - Booktitle = {Der schwarze Kater. Erzählungen}, - Location = {Zürich}, - Maintitle = {Gesammelte Werke in 5 Bänden}, - Origdate = {1843}, - Origlanguage = {american}, - Origtitle = {The Black Cat}, - Pages = {139--152}, - Publisher = {Haffmans Verlag}, - Title = {Der schwarze Kater}, - Translator = {Wollschläger, Hans}, - Volume = {3}, - Year = {1999}} -\end{ltxexample} -\fullcite{Poe.E:1982c} -\bigskip - -\noindent Wie das Beispiel zeigt, wird die deutsche Übersetzung am Ende in eckigen Klammern ausgegeben. Der Autor sowie die Angaben zum englischsprachigen Original, die im Eintrag der deutschen Fassung enthalten sind, werden nicht ausgegeben, da sie in diesem Fall redundant wären. - -\subsection{Rezensionen}\label{sub:rezis} -Der Dokumenttyp \bibtype{review} ist für Rezensionen gedacht und funktioniert analog zu den vorher beschriebenen Verknüpfunge. Auch hier werden zwei Einträge miteinander verbunden, wobei der Citekey des rezensierten Werks im Feld \bibfield{related} angegeben wird; da eine Rezension eigentlich immer mit dem rezensierten Werk verknüpft ist, entfällt die Angaben von \bibfield{relatedtype}. - -Das Feld \bibfield{title} ist bei \bibtype{review} fakultativ. Ist es nicht vorhanden, wird einfach nur »Rezension von \ldots« als Titel ausgegeben. - -\begin{ltxexample} -@movie{Cameron.J:2009b, - Author = {Cameron, James}, - Location = {USA and GB}, - Pagetotal = {162}, - Subtitle = {Avatar -- Aufbruch nach Pandora}, - Title = {Avatar}, - Year = {2009}} - -@review{Spiegel.S:2009a, - Author = {Spiegel, Simon}, - Date = {2009-12-17}, - Journal = {Basler Zeitung}, - Pages = {21--23}, - Title = {Welcome to Pandora}, - <<Related = {Cameron.J:2009b}>>} -\end{ltxexample} -\fullcite{Spiegel.S:2009a} - -\subsection{Verkürzte Bibliographie"=Einträge mit \bibfield{crossref} und \bibfield{xref}}\label{sub:kurz} - -\sty{biblatex} bietet zwei verschiedene Möglichkeiten an, um Eltern"= und Kindeinträge zu verbinden -- das \bibfield{crossref}"= und das \bibfield{xref}"=Feld. Mittels der \opt{mincrossrefs}"=Option von \sty{biblatex} kann bestimmt werden, ab wie vielen Nennungen von Kindereinträgen der Elterneintrag automatisch ausgegeben wird, selbst wenn dieser nicht explizit zitiert wird (siehe Kapitel 2.4.1 in der \sty{biblatex}"=Anleitung). Die Option \opt{partofcited} dagegen ist für einen anderen Fall vorgesehen: Wenn sowohl Eltern- wie auch Kindeintrag explizit zitiert werden, werden mit dieser Option bei der Ausgabe des Kindereintrages nicht die ganzen Angaben des Sammelbandes, sondern nur ein Verweis auf diesen ausgegeben. Auf das Verhalten von \opt{mincrossrefs} hat \opt{partofcited} keinen Einfluss. - -\newpage -\begin{ltxexample} -@book{Telotte.J:2008a, - Editor = {Telotte, J. P.}, - Location = {Lexington}, - Publisher = {University Press of Kentucky}, - Series = {Essential Readers in Contemporary Media and Culture}, - Title = {The Essential Science Fiction Television Reader}, - Year = {2008}} - -@incollection{Lavery.D:2008a, - Author = {Lavery, David}, - <<Crossref = {Telotte.J:2008a},>> - Pages = {283--245}, - Subtitle = {Is \film{Lost} Science Fiction?}, - Title = {The Island's Greatest Mystery}} -\end{ltxexample} -Diese Einträge führen, wenn sie beide zitiert werden und \opt{partofcited} aktiviert ist, zu folgender Ausgabe in der Bibliographie:\\ \\ -\fullcite{Telotte.J:2008a}\\ -\fullcite{Lavery.D:2008a} \\ - -%\noindent Es gibt bei dieser Option derzeit noch zwei Einschränkungen zu beachten: Die Nennung des Elterneintrags erfolgt übereinen \cmd{textcite}"=Befehl, der direkt in die \file{.bbl}"=Datei geschrieben wird. Dies hat zur Folge, dass der Elterneintrag und die verkürzte Variante des Kindereintrages auch dann in der Bibliographie ausgegeben bleiben, wenn der Elterneintrag bereits wieder gelöscht worden ist. Daran ändert auch ein erneuter \bin{biber}"=Durchlauf nichts. Um die korrekte Ausgabe zu erhalten, muss in dieser Situation die \file{.bbl}"=Datei von Hand gelöscht werden. Auch diese Beschränkungen sollte mit \sty{biblatex} 2.x fallen. - -%Derzeit ist diese Option nur beim \opt{authoryear}"=Format wirklich sinnvoll; beim Standardformat mit der Angabe des Jahres am Ende des Eintrags fehlt nun die Jahresangabe des Kindereintrags, was nicht optimal ist. Ideen für eine bessere Darstellungsform werden gerne entgegengenommen. - -\section{Kleinkram}\label{sub:besond} -\subsection{Neue Localization Strings} -Localization Strings sind vordefinierte Begriffe wie »Aufl.« oder »Hg.«, die von \sty{biblatex} verwendet und bei Bedarf an die jeweilige Sprache angepasst werden. \sty{biblatex-fiwi} definiert eine Reihe zusätzlicher Strings -- allerdings vorläufig nur auf Deutsch. Anpassungen an andere Sprachen müssen mittels \cmd{DefineBibliographyStrings} vorgenommen werden. - -\begin{keymarglist} -\item[fromjapanese] Der Ausdruck <aus dem Japanischen>. -\item[fromhebrew] Der Ausdruck <aus dem Hebräischen>. -\item[frompolish] Der Ausdruck <aus dem Polnischen>. -\item[minutes] Der Ausdruck <min>, für Längenangaben bei Filmen. -\item[meters] Der Ausdruck <m>, für Längenangaben bei Filmen. -\item[tvseason] Der Ausdruck <Staffel>, für Fernsehserien. -\item[tvepisode] Der Ausdruck <Folge>, für Fernsehserien. -\item[translatedto] Der Ausdruck <dt.>, wird verwendet, wenn die deutschsprachige Übersetzung eines fremdsprachigen Textes angegeben werden soll (siehe \opt{translatedas} und \bibfield{related} \secref{sub:germ}). -\item[prepublished] Der Ausdruck <Online-Vorveröffentlichung>. Ein zusätzlicher Publikationsstand für das Feld \bibfield{pubstate}. -\item[reviewof] Der Ausdruck <Rezension von>, wird bei \bibtype{review} verwendet. -%\item[undated] Der Ausdruck <Undatiert>, wird bei Einträgen ohne Datumsangabe verwendet. -\item[actors] Der Ausdruck <Darsteller>, wird bei der Anzeigen von Schauspielern verwendet, wenn die Option \opt{actor} aktiviert ist (vgl. \secref{opt}). - -\item[directedby] Der Ausdruck <Regie>, wird bei der Anzeigen von Regisseuren verwendet, wenn die Option \opt{script} aktiviert ist (vgl. \secref{opt}). - -\item[writtenby] Der Ausdruck <Buch>, wird bei der Anzeigen von Drehbuchautoren verwendet, wenn die Option \opt{script} aktiviert ist (vgl. \secref{opt}). - -\item[writtendirectedby] Der Ausdruck <Buch und Regie>, wird bei der Anzeigen von Regisseuren und Drehbuchautoren verwendet, wenn die Option \opt{script} aktiviert ist (vgl. \secref{opt}). -\end{keymarglist} - - - -\subsection{Aktivierte Optionen} -Wenn \sty{biblatex-fiwi} ohne weitere Optionen geladen wird, werden folgende \sty{biblatex}-Optionen gesetzt: - -\begin{ltxexample} -\ExecuteBibliographyOptions{indexing=cite,maxnames=3,minnames=3,maxitems=9, -useprefix=true,date=long,urldate=long,hyperref=auto, -pagetracker=true,ibidtracker=context,citetracker=true,labelyear=true, -isbn=false,babel=hyphen,partofcited} -\ExecuteBibliographyOptions[misc,movie,video]{uniquename=false, -labelyear=false,labeltitle=true} -\end{ltxexample} - - -\section{Beispiele}\label{beisp} -Die folgenden Beispiele sollen einen Einblick geben, was mit \sty{biblatex-fiwi} alles möglich ist. - -Für die Beispiele wurden folgende Optionen zusätzlich zu den Standardeinstellungen aktiviert: \kvopt{publisher}{true}, \kvopt{series}{true} und \kvopt{partofcited}{true}. Weitere Beispiele mit anderen Einstellungen finden sich in den separaten PDF"=Dateien.% - -\newpage\begin{ltxexample} -@collection{clute.j:1999, - Edition = {2}, - Editor = {Clute, John and Nicholls, Peter}, - Location = {London}, - Origdate = {1979}, - Publisher = {Orbit}, - Title = {The Encyclopedia of Science Fiction}, - Year = {1999}} -\end{ltxexample} -\fullcite{clute.j:1999}.%\pagebreak - -\begin{ltxexample} -@incollection{Wells.HG:1980, - Author = {Wells, H. G.}, - Bookauthor = {Wells, H. G.}, - Booktitle = {H.{\,}G. Wells's Literary Criticism}, - Editor = {Philmus, Robert M. and Parrinder, Patrick}, - Location = {Sussex}, - Origdate = {1938}, - Pages = {248--249}, - Publisher = {Harvester}, - Title = {Fiction about the Future}, - Year = {1980}} -\end{ltxexample} -\fullcite{Wells.HG:1980}. - -\begin{ltxexample} -@book{Kant.I:2004a, - Author = {Kant, Immanuel}, - Editor = {Weischedel, Wilhelm}, - Location = {Frankfurt a. M.}, - Maintitle = {Werkausgabe}, - Origdate = {1790}, - Publisher = {Suhrkamp}, - Title = {Kritik der Urteilskraft}, - Volume = {10}, - Year = {1996}} -\end{ltxexample} -\fullcite{Kant.I:2004a}.% -\newpage -\begin{ltxexample} -@book{Kuhn.T:1976, - Author = {Kuhn, Thomas Samuel}, - Edition = {2., rev. u. um das Postskriptum von 1969 ergänzte - Aufl.}, - Location = {Frankfurt a. M.}, - Origdate = {1962}, - Origlanguage = {english}, - Origlocation = {Chicago}, - Origpublisher = {University of Chicago Press}, - Origtitle = {The Structure of Scientific Revolutions}, - Publisher = {Suhrkamp}, - Title = {Die Struktur wissenschaftlicher Revolutionen}, - Translator = {Vetter, Hermann}, - Year = {1976}} -\end{ltxexample} -\fullcite{Kuhn.T:1976}. - -\begin{ltxexample} -@incollection{Kepler.J:1993, - Author = {Kepler, Johannes}, - Bookauthor = {Kepler, Johannes}, - Booktitle = {Calendaria et prognostica. Astronomica minora. - Somnium}, - Editora = {Bialas, Volker and Grössing, Helmuth}, - Editoratype = {redactor}, - Location = {München}, - Maintitle = {Gesammelte Werke}, - Origdate = {1634}, - Origlocation = {Frankfurt a. M}, - Origtitle = {Somnium sive De Astronomia Lunari}, - Pages = {317--379}, - Part = {2}, - Publisher = {Beck}, - Title = {Somnium}, - Volume = {11}, - Year = {1993}} -\end{ltxexample} -\fullcite{Kepler.J:1993}. -\newpage\begin{ltxexample} -@incollection{sklovskij.v:1969a, - Author = {Šklovskij, Viktor}, - Booktitle = {Texte zur allgemeinen Literaturtheorie und zur - Theorie der Prosa}, - Editor = {Striedter, Jurij}, - Location = {München}, - Maintitle = {Texte der Russsischen Formalisten}, - Number = {6}, - Origdate = {1929}, - Origlanguage = {russian}, - Origlocation = {Moskau}, - Origtitle = {Iskusstvo kak priem}, - Pages = {3--35}, - Publisher = {Wilhelm Fink Verlag}, - Series = {Theorie und Geschichte der Literatur und der der schönen - Künste. Texte und Abhandlungen}, - Title = {Die Kunst als Verfahren}, - Translator = {Fieguth, Rolf}, - Volume = {1}, - Year = {1969}} -\end{ltxexample} -\fullcite{sklovskij.v:1969a}. - -\begin{ltxexample} -@movie{Kubrick.S:1968, - Author = {Kubrick, Stanley}, - Location = {GB and USA}, - Subtitle = {2001: Odyssee im Weltraum}, - Title = {2001: A Space Odyssey}, - Year = {1968}} -\end{ltxexample} -\fullcite{Kubrick.S:1968}. - -\begin{ltxexample} -@movie{Lidelof.D:2004a, - Author = {Lidelof, Damon and Cuse, Carlton and Abrams, J. J.}, - Date = {2004/2010}, - Entrysubtype = {serial}, - Location = {USA}, - Organization = {ABC}, - Title = {Lost}} -\end{ltxexample} -\fullcite{Lidelof.D:2004a}. - -\begin{ltxexample} -@book{Oeuver.A:2010a, - Editor = {van den Oever, Annie}, - Location = {Amsterdam}, - Number = {1}, - Publisher = {Amsterdam University Press}, - Series = {The Key Debates}, - Subtitle = {On \enquote{Strangeness} and the Moving Image. - The History, Reception, and Relevance of a Concept}, - Title = {Ostrannenie}, - Year = {2010}} - -@review{Spiegel.S:2011b, - Author = {Spiegel, Simon}, - Doi = {10.3167/proj.2011.050209}, - Journal = {Projections}, - Number = {2}, - Pages = {128--134}, - Related = {Oeuver.A:2010a}, - Volume = {5}, - Year = {2011}} -\end{ltxexample} -\fullcite{Spiegel.S:2011b} - -\begin{ltxexample} -@book{Pearson.R:2009a, - Editor = {Pearson, Roberta E.}, - Location = {London and New York}, - Publisher = {I. B. Tauris}, - Subtitle = {Perspectives on a Hit Television Show}, - Title = {Reading Lost}, - Year = {2009}} - -@incollection{Ndalianis.A:2009b, - Author = {Ndalianis, Angela}, - Booksubtitle = {Perspectives on a Hit Television Show}, - Booktitle = {Reading Lost}, - Editor = {Pearson, Roberta E.}, - Location = {London and New York}, - Pages = {181--197}, - Publisher = {I. B. Tauris}, - Title = {Lost in Genre: Chasing the White Rabbit to Find a - White Polar Bear}, - Xref = {Pearson.R:2009a}, - Year = {2009}} -\end{ltxexample} -\fullcite{Pearson.R:2009a}\\ -\fullcite{Ndalianis.A:2009b} - -\section{Versionsgeschichte} - - -\begin{changelog} - -\begin{release}{1.5}{2016-05-17} -\item Setzt \sty{biblatex} ab Version 3.4 resp \bin{biber} ab Version 2.5 voraus. -\item Anpassung an interne Änderungen von \sty{biblatex} -\item Neue Felder \bibfield{alternatitle} und \bibfield{alternatetitlescript} \see{alternatetitle} -\item Beim Zitieren von zwei Filmen mit identischem Titel wird immer das Jahr ausgegeben \see{zitbefehl} -\item Beim Indexieren von zwei Filmen mit identischem Titel wird immer das Jahr ausgegeben \see{zitbefehl} -\item Es wird nun überprüft, ob das Paket \sty{ragged2e} vorhanden ist -\item Bei \cmd{multicitedelim} wird nun standardmäßig immer ein Komma ausgegeben -\item Die Dokumentation wird nun mit \luatex gesetzt -\end{release} - -\begin{release}{1.4}{2016-03-09} -\item Setzt \sty{biblatex} ab Version 3.4 resp \bin{biber} ab Version 2.4 voraus. -\item Anpassung an interne Änderungen von \sty{biblatex} im Umgang mit Namen -\item Verbesserte Ausgabe von \cmd{footcite}-Befehlen -\item Korrigiert mehrere kleine Fehler -\end{release} - - -\begin{release}{1.3}{2015-06-30} -\item Setzt \sty{biblatex} ab Version 3.0. resp \bin{biber} ab Version 2.0 voraus. -\item Korrigiert mehrere kleine Fehler -\end{release} - - - -\begin{release}{1.2e}{2015-01-10} -\item Neue Option \opt{ibidpage} \see{opt} -\item Neue Option \opt{mergedate} \see{opt} -\item Neue Option \opt{parensvolume} \see{opt} -\item \bibtype{review} stellt nun auch Artikel in Büchern korrekt dar -\item Bei fehlender Datumsangabe wird der der Bibstring \texttt{nodate} statt \texttt{undated} verwendet -\item Interne Reorganisation -\item Korrigiert mehrere kleine Fehler -\end{release} - - -\begin{release}{1.2d}{2013-05-13} -\item Setzt \sty{biblatex} ab Version 2.6. resp \bin{biber} ab Version 1.6 voraus. -\item Korrigiert mehrere kleine Fehler -\end{release} - -\begin{release}{1.2c}{2013-03-29} -\item Neue Option \opt{isbn} \see{opt} -\item Korrigiert einen dummen Fehler mit dem den Dokumenttyp \bibtype{misc} -\end{release} - - - - -\begin{release}{1.2b}{2012-12-09} -\item Korrigiert zwei dumme Fehler der vorhergehen Version -\end{release} - -\begin{release}{1.2a}{2012-12-03} -\item Neue Optionen \opt{ignoreforeword}, \opt{ignoreafterword}, \opt{ignoreintroduction} und \opt{ignoreparatext} (Anregung von Rolf Niepraschk) \see{opt} -\item Dazu passende Befehle für Wechsel innerhalb des Dokuments \see{opt} -\item Neues Feld \bibfield{parttitle} \see{sub:zusatzfeld} -\item Leicht geänderte Ausgabe des Typs \bibtype{review} -\item Kleine Fehlerkorrekturen (Dank an Rolf Niepraschk) -\end{release} - -\begin{release}{1.2}{2012-07-20} -\item Unterstützung der \bibfield{related}-Funktionen, die \sty{biblatex} seit Version 2.0 anbietet: -\subitem Übersetzungen und Neuauflagen \see{sub:uebersetzungen} -\subitem Anpassung der Option \opt{partofcited} \see{sub:kurz} -\subitem Anpassung des Typs \bibtype{review} \see{sub:rezis} -\subitem Option \opt{germ} überarbeitet und in \opt{translatedas} umbenannt \see{sub:germ} -\subitem In allen Fällen ist nun nur noch ein Durchlauf von \bin{biber} nötig -\item Neuer \bibfield{entrysubtype} für Fernsehsendungen \see{movie:tv} -\item \cmd{citefilm} gibt bei Serien und Fernsehendungen nun \bibfield{maintitle} aus -\item Neuer Befehl \cmd{citeepisode} \see{sub:serien} -\item Sortierschema \opt{title} hinzugefügt \see{sub:sort} -\item Option \opt{ignorearticle} hinzugefügt \see{sub:sort} -\item Bei fehlender Datumsangabe wird nun der der Bibstring \texttt{undated} ausgegeben -\item Weitere Detailkorrekturen -\end{release} - - -\begin{release}{1.1e}{2011-12-16} -\item Neuer Befehl \cmd{inparencite} (Anregung von Christian Erll) \see{zitbefehl} -\item Unterstützung für den Dokumenttyp \bibtype{periodical} \see{supp:types} -\item Neue Paketoption \opt{citefilm} \see{opt} -\item Neue Paketoption \opt{pages} \see{opt} -\item Zusätzliche Localization Strings \bibfield{page} und \bibfield{pages} \see{sub:besond} -\item Die Option \opt{origyearwithyear=brackets} hinzugefügt \see{opt} -\item Unterstützung für das Feld \bibfield{nameaddon} \see{sub:zusatzfeld} -\item Mehrere Fehler bei der Option \opt{dashed} korrigiert -\item Fehlende Seitenzahlen bei der Option \opt{partofcited} ergänzt - -\item Die Ausgabeform für \bibtype{article} wurde leicht geändert -\end{release} - -\begin{release}{1.1d}{2011-12-13} -\item Separate Beispiele mit unterschiedlichen Einstellungen hinzugefügt -\item Viel Detail"=Aufräumarbeiten, zahlreiche kleine Unregelmäßigkeiten korrigiert -\item Zukünftige Versionen sollten dank eines neuen Testverfahrens seltener neue Fehler einführen -\end{release} - -\begin{release}{1.1c}{2011-12-06} -\item Die Option \opt{partofcited hinzugeführt} \see{sub:kurz} -\item Das Format des Beispiels für \file{biber.conf} angepasst \see{sub:sort} -\end{release} - -\begin{release}{1.1b}{2011-11-22} -\item Die Option \opt{origyearsuperscript} hinzugefügt \see{opt} -\item Die Option \opt{origyearwithyear} hinzugefügt \see{opt} -\item Die Option \opt{yearatbeginning} hinzugefügt, entspricht dem Stil \sty{fiwi2} \see{opt} -\item Die Datei \file{fiwi2.cbx} hinzugefügt, ermöglicht den Aufruf \opt{style=fiwi2} -\item Kleine Fehlerkorrekturen (Dank an Dominik Waßenhoven) -\end{release} - -\begin{release}{1.1a}{2011-11-18} -\item Kleine Fehlerkorrekturen (Dank an j mach wust) -\end{release} - -\begin{release}{1.1}{2011-11-15} -\item Erste Veröffentlichung -\end{release} - -\end{changelog} -%\printbibliography -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/diss.xdy new/doc/latex/biblatex-fiwi/diss.xdy --- old/doc/latex/biblatex-fiwi/diss.xdy 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-fiwi/diss.xdy 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,28 @@ +(merge-rule "altscript\:(.*)-font(.*)" "\2" :eregexp :again) + +(merge-rule "\\film\{(.*)" "\1~b2" :eregexp :again) +(merge-rule "\\film \{(.*)" "\1~b2" :eregexp :again) +(merge-rule "\\film \{(.*)" "\1~b2" :eregexp :again) + +(merge-rule "\\textsc\{(.*)" "\1~b2" :eregexp :again) +(merge-rule "\\textsc\ \{(.*)" "\1~b2" :eregexp :again) + +(merge-rule "\\emph \{(.*)" "\1~b1" :eregexp :again) +(merge-rule "\\emph\{(.*)" "\1~b1" :eregexp :again) +(merge-rule "\\emph \{(.*)" "\1~b1" :eregexp :again) + +(merge-rule "The (.*)" "\1~,The" :again) +(merge-rule "La (.*)" "\1~,La" :again) +(merge-rule "Le (.*)" "\1~,Le" :again) +(merge-rule "Die (.*)" "\1~,Die" :again) +(merge-rule "Der (.*)" "\1~,Der" :again) +(merge-rule "Das (.*)" "\1~,Das" :again) +(merge-rule "von (.*)" "\1~,von" :again) +(merge-rule "Un (.*)" "\1~,Un" :again) +(merge-rule "A (.*)" "\1~,A" :again) + +(merge-rule "\\textcyr \{(.*)\}/(.*)" "\2" :again) +(merge-rule "\\textcyr \{(.*)\}\\addslash (.*)" "\2" :again) +(merge-rule "\\textcyr\{(.*)\}\\addslash (.*)" "\2" :again) +(merge-rule "\\textcyr\{(.*)\}\}/(.*)" "\2" :again) +(sort-rule "Ž" "z") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/dissff.xdy new/doc/latex/biblatex-fiwi/dissff.xdy --- old/doc/latex/biblatex-fiwi/dissff.xdy 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-fiwi/dissff.xdy 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,17 @@ +(define-location-class "arabic-page-numbers" ("arabic-numbers") :min-range-length 1) +(markup-range :class "arabic-page-numbers" :close "\,f." :length 1 :ignore-end) +(markup-range :class "arabic-page-numbers" :close "\,ff." :length 2 :ignore-end) +(markup-range :sep "--") + +(markup-index :open "\begin{theindex} + \RaggedRight + ~n" + :close "~n~n\end{theindex}~n" + :tree) + +(markup-letter-group :open-head "~n\letterGroup{" + :close-head "}{}~n") + +(markup-letter-group :open-head "~n\letterGroup{1--9}{" + :close-head "}~n" + :group "default") Binary files old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf and new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex --- old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex 2012-07-23 00:53:22.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex 2016-11-25 19:28:15.000000000 +0100 @@ -27,6 +27,7 @@ \defbibheading{film}{\addsec{Filmographie}} \printbibliography[nottype=movie] -\printbibliography[type=movie,heading=film,sorting=title] +\newrefcontext[sorting=title] +\printbibliography[type=movie,heading=film] \end{document} \ No newline at end of file Binary files old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.pdf and new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.tex new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.tex --- old/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.tex 2016-05-18 23:57:41.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.tex 2017-01-22 00:01:03.000000000 +0100 @@ -24,13 +24,12 @@ \usepackage{graphicx} \usepackage{btxdockit} \usepackage[german=guillemets]{csquotes} -\usepackage[citestyle=fiwi,bibstyle=fiwi,dashed,backend=biber,xindy=true]{biblatex} +\usepackage[citestyle=fiwi,bibstyle=fiwi,dashed,backend=biber,xindy=true,titleindex=subitem]{biblatex} \newbibmacro*{altscript:cyrillic-font}[1]{% {\cyrillicfont{\textsc{#1}}}} \ExecuteBibliographyOptions{bibencoding=utf8} \ExecuteBibliographyOptions{backref=false} - %Index \RequirePackage{filecontents} @@ -101,10 +100,9 @@ \fullcitefilm - \begin{document} -\title{biblatex-fiwi}\subtitle{Beispiele für den Einsatz von xindy und alternatetitle}\date{}\maketitle -\noindent Dieses Dokument zeigt die Darstellungsweise von \sty{biblatex-fiwi} mit der Option \opt{xindy} und dem Feld \bibfield{alternatetitle}.\\ \\ +\title{biblatex-fiwi}\subtitle{Beispiele für den Einsatz von xindy, titleindex und alternatetitle}\date{}\maketitle +\noindent Dieses Dokument zeigt die Darstellungsweise von \sty{biblatex-fiwi} mit den Optionen \opt{xindy} und \opt{titleindex=subitem} sowie dem Feld \bibfield{alternatetitle}.\\ \\ \noindent Zuerst zitieren wir ein paar Filme: \citefilm{Haller.D:1965}, \citefilm{Liebeneiner.W:1952}, \citefilm{Bradley.D:1960}, \citefilm{Coppola.F:1972a}, \citefilm{Kaufman.P:1978}, \citefilm{Siegel.D:1956} und \citefilm{Menzies.W:1953}. @@ -114,11 +112,12 @@ Dann folgen verschiedene Fernsehserien- und sendungen: \citefilm{Ball.A:2003a}, \citeepisode{Reardon.J:1994a}, \citefilm{Newton:2012a}, \citefilm{Wuergel.H:2012d} und \citefilm{Wuergel.H:2012b}. -Dann einen Haufen Texte: \textcite{sklovskij.v:1969a} \textcite{Spiegel.S:2010c}, \textcite{Muller.A:2010a}, \textcite{Wells.H:1908}, \textcite{Spiegel.S:2007b}, \textcite{Lukian.1981}, \textcite{Kepler.J:1993}, \textcite{Coleridge:1983a}, \textcite{vonMatt.P:2002}, \textcite{Keitz.U:2004a}, \textcite{Wells.HG:1980}, \textcite{Ackerman.Strickland:1981}, \textcite{Anderson.P:1971a}, \textcite{Gaudreault.A:1993}, \textcite{Poe.E:1982c}, \textcite{Poe.E:1999a}, \textcite{Parrinder.P:1980}, \textcite{Wells.H:1980*2}, \textcite{James.H:2004a}, \textcite{James.H:2007a}, \textcite{Hedeler.W:2005a}, \textcite{Ballhausen.T:2009a}, \textcite{Zymner.R:2003a}, \textcite{Zymner.R:2011a}, \textcite{Nelmes.J:2011b}, \textcite{Kuhn.A:1990*2,Blish.J:1973a,Dureau.Y:2005a}, \textcite{Todorov.T:1992}, \textcite{Bordwell.D:2004a} und \textcite{Kirchner.A:2008a}. +Dann einen Haufen Texte: \textcite{sklovskij.v:1969a} \textcite{Spiegel.S:2010c}, \textcite{Muller.A:2010a}, \textcite{Wells.H:1908}, \textcite{Spiegel.S:2007b}, \textcite{Lukian.1981}, \textcite{Kepler.J:1993}, \citetitle{Coleridge:1983a}, \textcite{vonMatt.P:2002}, \textcite{Keitz.U:2004a}, \textcite{Wells.HG:1980}, \textcite{Ackerman.Strickland:1981}, \textcite{Anderson.P:1971a}, \textcite{Gaudreault.A:1993}, \textcite{Poe.E:1982c}, \textcite{Poe.E:1999a}, \textcite{Parrinder.P:1980}, \textcite{Wells.H:1980*2}, \textcite{James.H:2004a}, \textcite{James.H:2007a}, \textcite{Hedeler.W:2005a}, \textcite{Ballhausen.T:2009a}, \textcite{Zymner.R:2003a}, \textcite{Zymner.R:2011a}, \textcite{Nelmes.J:2011b}, \textcite{Kuhn.A:1990*2,Blish.J:1973a,Dureau.Y:2005a}, \textcite{Todorov.T:1992}, \textcite{Bordwell.D:2004a} und \textcite{Kirchner.A:2008a}. \defbibheading{film}{\addsec{Filmographie}} \printbibliography[nottype=movie] -\printbibliography[type=movie,sorting=title,heading=film] +\newrefcontext[sorting=title] +\printbibliography[type=movie,heading=film] \printindex \end{document} \ No newline at end of file Binary files old/doc/latex/biblatex-fiwi/example-biblatex-fiwi.pdf and new/doc/latex/biblatex-fiwi/example-biblatex-fiwi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex new/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex --- old/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex 2016-05-18 23:57:41.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/example-biblatex-fiwi.tex 2016-11-25 19:28:15.000000000 +0100 @@ -30,6 +30,7 @@ \defbibheading{film}{\addsec{Filmographie}} \printbibliography[nottype=movie] -\printbibliography[type=movie,sorting=title,heading=film] +\newrefcontext[sorting=title] +\printbibliography[type=movie,heading=film] \end{document} \ No newline at end of file Binary files old/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.pdf and new/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.tex new/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.tex --- old/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.tex 2016-03-11 00:21:10.000000000 +0100 +++ new/doc/latex/biblatex-fiwi/example-biblatex-fiwi2-options.tex 2016-11-25 19:28:15.000000000 +0100 @@ -27,6 +27,7 @@ \defbibheading{film}{\addsec{Filmographie}} \printbibliography[nottype=movie] -\printbibliography[type=movie,heading=film,sorting=title] +\newrefcontext[sorting=title] +\printbibliography[type=movie,heading=film] \end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-fiwi/examples.bib new/doc/latex/biblatex-fiwi/examples.bib --- old/doc/latex/biblatex-fiwi/examples.bib 2016-05-18 23:57:41.000000000 +0200 +++ new/doc/latex/biblatex-fiwi/examples.bib 2017-01-22 00:01:03.000000000 +0100 @@ -2,13 +2,28 @@ %% http://bibdesk.sourceforge.net/ -%% Created for Simon Spiegel at 2016-04-06 09:56:34 +0200 +%% Created for Simon Spiegel at 2016-06-17 14:03:54 +0200 %% Saved with string encoding Unicode (UTF-8) +@book{Blish.J:1973a, + Address = {Chicago}, + Author = {given=William, family=Atheling, suffix=Jr., truefamily=Blish, truegiven=James}, + Date-Added = {2016-06-17 08:57:42 +0000}, + Date-Modified = {2016-06-17 08:57:42 +0000}, + Edition = {2}, + Keywords = {Diss, Science Fiction, Autorstatement, Kritik, Literatur}, + Origdate = {1964}, + Publisher = {Advent Publishers}, + Read = {Yes}, + Standort = {Privat}, + Subtitle = {Studies in Contemporary Magazine Science Fiction}, + Title = {The Issue at Hand}, + Year = {1973}} + @movie{Kaufman.P:1978, Address = {USA}, Author = {Kaufman, Philip}, @@ -136,17 +151,6 @@ Title = {The Godfather}, Year = {1972}} -@book{Blish.J:1973a, - Address = {Chicago}, - Author = {Atheling, Jr., William}, - Edition = {2}, - Nameaddon = {James Blish}, - Origdate = {1964}, - Publisher = {Advent Publishers}, - Subtitle = {Studies in Contemporary Magazine Science Fiction}, - Title = {The Issue at Hand}, - Year = {1973}} - @incollection{Kuhn.A:1990*2, Address = {London and New York}, Author = {Kuhn, Annette}, @@ -293,15 +297,17 @@ @movie{Haller.D:1965, Address = {GB}, Author = {Haller, Daniel}, - Sorttitle = {Die, Monster, Die!}, + Indextitle = {Die, Monster, Die"!}, Title = {Die, Monster, Die!}, Year = {1965}} @article{Gaudreault.A:1993, Address = {Basel and Frankfurt a.\,M.}, Author = {Gaudreault, André}, + Date-Modified = {2016-06-17 09:53:58 +0000}, Issuetitle = {Georges Méliès -- Magier der Filmkunst}, - Journal = {KINtop. Jahrbuch zur Erforschung des frühen Films}, + Journal = {KINtop}, + Journalsubtitle = {Jahrbuch zur Erforschung des frühen Films}, Month = {11}, Number = {2}, Origdate = {1984}, @@ -353,12 +359,14 @@ Address = {Routlegde and Kegan Paul}, Author = {Coleridge, Samuel Taylor}, Editor = {Engell, James and Bate, W. Jackson}, + Indextitle = {Biographia Literaria}, Maintitle = {The Collected Works of Samuel Taylor Coleridge}, Number = {316}, Origdate = {1817}, Part = {2}, Publisher = {Princeton University Press}, Series = {The Bollinger Series}, + Shorttitle = {Biographia Literaria}, Title = {Biographia Literaria, or Biographical Sketches of My Literary Life and Opinions}, Volume = {7}, Year = {1983}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-fiwi.doc.tlpobj new/tlpkg/tlpobj/biblatex-fiwi.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-fiwi.doc.tlpobj 2016-05-19 17:30:52.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-fiwi.doc.tlpobj 2017-04-14 17:31:50.000000000 +0200 @@ -1,12 +1,13 @@ name biblatex-fiwi.doc category Package -revision 41240 +revision 43082 shortdesc doc files of biblatex-fiwi relocated 1 -docfiles size=198 +docfiles size=193 RELOC/doc/latex/biblatex-fiwi/README RELOC/doc/latex/biblatex-fiwi/biblatex-fiwi.pdf - RELOC/doc/latex/biblatex-fiwi/biblatex-fiwi.tex + RELOC/doc/latex/biblatex-fiwi/diss.xdy + RELOC/doc/latex/biblatex-fiwi/dissff.xdy RELOC/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.pdf RELOC/doc/latex/biblatex-fiwi/example-biblatex-fiwi-options.tex RELOC/doc/latex/biblatex-fiwi/example-biblatex-fiwi-xindy.pdf ++++++ biblatex-fiwi.tar.xz ++++++ ++++ 1750 lines of diff (skipped) ++++++ biblatex-gost.doc.tar.xz ++++++ ++++ 18089 lines of diff (skipped) ++++++ biblatex-gost.tar.xz ++++++ ++++ 2145 lines of diff (skipped) ++++++ biblatex-historian.doc.tar.xz ++++++ ++++++ biblatex-historian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-historian.tlpobj new/tlpkg/tlpobj/biblatex-historian.tlpobj --- old/tlpkg/tlpobj/biblatex-historian.tlpobj 2016-04-14 18:42:19.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-historian.tlpobj 2017-04-14 17:31:52.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/biblatex-historian/historian.cbx RELOC/tex/latex/biblatex-historian/historian.lbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-historian -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics humanities biblatex catalogue-version 0.4 ++++++ biblatex-ieee.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf and new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex --- old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex 2016-05-10 00:41:34.000000000 +0200 +++ new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex 2017-03-27 23:41:54.000000000 +0200 @@ -24,8 +24,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{ieee-alphabetic} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1n, last revised 2016/05/08.}} -\date{Released 2016/05/08} + \footnote{This file describes v1.2d, last revised 2017/03/27.}} +\date{Released 2017/03/27} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -55,7 +55,7 @@ \end{document} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee.bib new/doc/latex/biblatex-ieee/biblatex-ieee.bib --- old/doc/latex/biblatex-ieee/biblatex-ieee.bib 2016-04-16 23:19:37.000000000 +0200 +++ new/doc/latex/biblatex-ieee/biblatex-ieee.bib 2017-03-03 00:01:04.000000000 +0100 @@ -28,7 +28,7 @@ author = "B. K. Bul", title = "Theory Principles and Design of Magnetic Circuits", publisher = "Energia Press", - loction = "Moscow", + location = "Moscow", year = "1964", pages = "464", note = "(in Russian)" @@ -45,7 +45,7 @@ @book{IEEEexample:bookwithseriesvolume, editor = "J. Breckling", - title = "The Analysis of Directional Time Series: applications to + title = "The Analysis of Directional Time Series: Applications to Wind Speed and Direction", series = "Lecture Notes in Statistics", publisher = "Springer", @@ -386,7 +386,7 @@ } %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright at morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-ieee/biblatex-ieee.pdf and new/doc/latex/biblatex-ieee/biblatex-ieee.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee.tex new/doc/latex/biblatex-ieee/biblatex-ieee.tex --- old/doc/latex/biblatex-ieee/biblatex-ieee.tex 2016-05-10 00:41:34.000000000 +0200 +++ new/doc/latex/biblatex-ieee/biblatex-ieee.tex 2017-03-27 23:41:54.000000000 +0200 @@ -24,9 +24,10 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{ieee} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1n last revised 2016/05/08.}} -\date{Released 2016/05/08} + \footnote{This file describes v1.2d last revised 2017/03/27.}} +\date{Released 2017/03/27} +\providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} \RecordChanges @@ -38,7 +39,7 @@ This package provides a style for \pkg{biblatex} which follows the guidelines of the \textsc{ieee}. The citation style is numeric and unsorted. The bibliography style follows the pattern of the official \pkg{IEEEtran} -package (\url{http://www.ieee.org/documents/stylemanual.pdf}). The style +package (\url{http://www.ieee.org/documents/style_manual.pdf}). The style should be loaded in the usual way \begin{verbatim} \usepackage[style=ieee]{biblatex} @@ -47,7 +48,7 @@ generated by the package using the \texttt{biblatex-ieee.bib} database of example citations. -The package introduces new bibliography strings: +The style introduces new bibliography strings: \begin{description} \item[\texttt{patentjp}] the text \enquote{Japanese Patent}; \item[\texttt{presentedat}] the text \enquote{presented at the} when @@ -56,6 +57,10 @@ \end{description} These may be localized in the usual way. +The style adds the \opt{dashed} option to those recognised: as-standard, +this is activated. The option works in the same way as that from the +core \pkg{biblatex} style \pkg{author-year}. + The appearance of URLs in the bibliography is set by the mechanism of the \textsf{url} package. Thus to print URLs in the current roman font, place the instruction @@ -84,8 +89,6 @@ {\texttt{joseph.wright(a)morningstar2.co.uk}}. \nocite{*} -\cite{IEEEexample:incollectionwithseries,IEEEexample:bookwitheditor} - \printbibliography \changes{v1.0}{2011/02/27}{First stable release} @@ -123,13 +126,26 @@ \changes{v1.1m}{2016/04/16}{Much simplified citation style approach} \changes{v1.1n}{2016/05/08}{Fix printing of titles when braced in database} +\changes{v1.1o}{2016/06/27}{Fix capitalisation of journal titles} +\changes{v1.1p}{2016/07/20}{Revert changes in internal code for citation + handling} +\changes{v1.1q}{2016/08/31}{Fix stray space after \enquote{\emph{et al.}}} +\changes{v1.2}{2016/12/26}{New \opt{dashed} option} +\changes{v1.2}{2016/12/29}{Refine handling of case changing in titles} +\changes{v1.2}{2016/12/30}{Use title case for book tiles} +\changes{v1.2a}{2017/02/02}{Minor internal updates} +\changes{v1.2a}{2017/03/01}{Move some formatting directives} +\changes{v1.2a}{2017/03/01}{More work on formatting of titles} +\changes{v1.2b}{2017/03/22}{Fix accidental printing of string \texttt{no.}} +\changes{v1.2c}{2017/03/25}{Fix formatting for volume in some entry types} +\changes{v1.2d}{2017/03/26}{Subtle adjustment for volume string} \PrintChanges \end{document} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj new/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj 2016-05-10 23:42:07.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj 2017-04-14 17:31:52.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-ieee.doc category Package -revision 40983 +revision 43620 shortdesc doc files of biblatex-ieee relocated 1 docfiles size=175 ++++++ biblatex-ieee.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee-alphabetic.bbx new/tex/latex/biblatex-ieee/ieee-alphabetic.bbx --- old/tex/latex/biblatex-ieee/ieee-alphabetic.bbx 2016-05-10 00:41:34.000000000 +0200 +++ new/tex/latex/biblatex-ieee/ieee-alphabetic.bbx 2017-03-27 23:41:54.000000000 +0200 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee-alphabetic.bbx}[2016/05/08 v1.1n biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2017/03/27 v1.2d biblatex bibliography style] \RequireBibliographyStyle{ieee} @@ -26,7 +26,7 @@ \defbibenvironment{bibliography} {\list {\printtext[labelalphawidth]{% - \printfield{prefixnumber}% + \printfield{labelprefix}% \printfield{labelalpha}% \printfield{extraalpha}}} {\setlength{\labelwidth}{\labelalphawidth}% @@ -53,7 +53,7 @@ {\item} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee-alphabetic.cbx new/tex/latex/biblatex-ieee/ieee-alphabetic.cbx --- old/tex/latex/biblatex-ieee/ieee-alphabetic.cbx 2016-05-10 00:41:34.000000000 +0200 +++ new/tex/latex/biblatex-ieee/ieee-alphabetic.cbx 2017-03-27 23:41:54.000000000 +0200 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee-alphabetic.cbx}[2016/05/08 v1.1n biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2017/03/27 v1.2d biblatex citation style] \RequireCitationStyle{alphabetic} @@ -45,7 +45,7 @@ } %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee.bbx new/tex/latex/biblatex-ieee/ieee.bbx --- old/tex/latex/biblatex-ieee/ieee.bbx 2016-05-10 00:41:34.000000000 +0200 +++ new/tex/latex/biblatex-ieee/ieee.bbx 2017-03-27 23:41:54.000000000 +0200 @@ -8,11 +8,18 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.bbx}[2016/05/08 v1.1n biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2017/03/27 v1.2d biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} +% An option that carries through from author-year styles +\DeclareBibliographyOption[boolean]{dashed}[true]{% + \ifstrequal{#1}{true} + {\ExecuteBibliographyOptions{pagetracker}% + \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} + {\renewbibmacro*{bbx:savehash}{}}} + % Alter settings that carry through from biblatex \ExecuteBibliographyOptions{ giveninits, @@ -23,18 +30,21 @@ \uspunctuation % Custom field formats +\DeclareFieldFormat[article]{number}{\bibstring{number}\addnbspace#1} \DeclareFieldFormat[patent]{number}{\mkonepagegrouped{#1}} \DeclareFieldFormat{pages}{% \mkpageprefix[bookpagination][\mkpagegrouped]{#1}% } -\DeclareFieldFormat{titlecase}{\bbx@colon@search{#1}} -\DeclareFieldFormat{sentencecase}{\bbx@colon@search{#1}} +\DeclareFieldFormat{sentencecase}{\bbx@colon@search{\MakeSentenceCase*}{#1}} +\DeclareFieldFormat[book,inbook,incollection,inproceedings]{series} + {\bibstring{jourser}\addnbspace#1} \DeclareFieldFormat[online]{title}{#1\isdot} \DeclareFieldFormat[report]{title}{\mkbibquote{#1\isdot}} \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}} - -% Brackets around labels in the bibliography -%\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} +\DeclareFieldFormat*{volume} + {\bibstring{volume}\addnbspace#1} +\DeclareFieldFormat[article,periodical]{volume} + {\bibstring{jourvol}\addnbspace#1} % Simple modifications to punctuation, etc. \renewcommand*\bibnamedash{\textemdash\textemdash} @@ -46,7 +56,7 @@ \NewBibliographyString{presentedat} \DefineBibliographyStrings{english}{ - andothers = \mkbibemph{et al\adddot}\addspace , + andothers = \mkbibemph{et al\adddot} , chapter = ch\adddot , editor = Ed\adddot , editors = Eds\adddot , @@ -266,19 +276,6 @@ \printfield{pages}% } -\renewbibmacro*{series+number}{% - \iffieldundef{series} - {} - {% - \bibstring{jourser}% - \addspace - \printfield{series}% - \setunit*{\addspace}% - }% - \printfield{number}% - \newunit -} - \renewbibmacro*{title}{% \ifboolexpr{ test {\iffieldundef{title}} @@ -306,55 +303,19 @@ {} {% \printtext[title]{% - \printfield[sentencecase]{title}% + \printfield[titlecase]{title}% \setunit{\subtitlepunct}% - \printfield[sentencecase]{subtitle}% + \printfield[titlecase]{subtitle}% }% \newunit }% \printfield{titleaddon}% } - -\renewbibmacro*{title+issuetitle}{% - \usebibmacro{periodical}% - \newunit - \printfield{series} - \newunit - \iffieldundef{volume}% - {} - {% - \bibstring{volume}% - \addspace - \printfield{volume}% - \newunit - } - \printfield{number}% - \newunit - \printfield{eid}% - \newunit - \usebibmacro{issue+date}% - \newunit - \usebibmacro{issue}% - \newunit -} \renewbibmacro*{volume+number+eid}{% - \iffieldundef{volume} - {} - {% - \bibstring{volume}% - \addspace - \printfield{volume}% - \newunit - }% - \iffieldundef{number} - {} - {% - \bibstring{number}% - \addspace - \printfield{number}% - \newunit - }% + \printfield{volume}% + \newunit + \printfield{number}% \newunit \printfield{eid}% } @@ -463,18 +424,19 @@ } % {<process>} {<text>} -\newcommand*{\bbx@colon@search}[1]{% - \bbx@colon@search@aux\empty#1: \stop +\newcommand*{\bbx@colon@search}[2]{% + \bbx@colon@search@auxi\empty#2: \stop{#1}% } -\long\def\bbx@colon@search@aux#1: #2\stop{% - \expandafter\MakeSentenceCase\expandafter*\expandafter{#1}% +\long\def\bbx@colon@search@auxi#1: #2\stop#3{% + \expandafter\bbx@colon@search@auxii\expandafter{#1}{#3}% \ifblank{#2} {} {% : % - \bbx@colon@search@aux\empty#2\stop + \bbx@colon@search@auxi\empty#2\stop{#3}% }% } +\newcommand\bbx@colon@search@auxii[2]{#2{#1}} % New bibliography drivers, using the required order of fields. These % are mainly copied from standard.bbx then modified. @@ -806,7 +768,7 @@ } %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee.cbx new/tex/latex/biblatex-ieee/ieee.cbx --- old/tex/latex/biblatex-ieee/ieee.cbx 2016-05-10 00:41:34.000000000 +0200 +++ new/tex/latex/biblatex-ieee/ieee.cbx 2017-03-27 23:41:54.000000000 +0200 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.cbx}[2016/05/08 v1.1n biblatex citation style] +\ProvidesFile{ieee.cbx}[2017/03/27 v1.2d biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -18,24 +18,50 @@ sorting = none } +% Putting brackets around each citation number is a two-part +% operation. First, remove them from around the whole citation by +% redeclaring here. \DeclareCiteCommand{\cite}% - {}% % precode - {\bibopenbracket% % loopcode - \usebibmacro{prenote}% - \usebibmacro{cite:init}% - \usebibmacro{citeindex}% - \usebibmacro{cite:comp}% - \usebibmacro{cite:dump}% - \usebibmacro{postnote}% - \bibclosebracket}% - {\multicitedelim}% % sepcode - {}% % postcode + {\usebibmacro{cite:init}% + \bibopenbracket + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:comp}} + {} + {\usebibmacro{cite:dump}% + \usebibmacro{postnote}% + \bibclosebracket + } + +% The second step is to replace \multicitedelim with a version wrapped in +% the appropriate delimiter. +\renewcommand*{\do}[1]{% + \expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{#1}\endcsname}% + {\multicitedelim} + {\bibclosebracket\multicitedelim\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% + } +\docsvlist{cite:comp:comp,cite:comp:end,cite:comp:inset,cite:dump} + +% There's also one \bibrangedash to alter. +\expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{cite:dump}\endcsname}% + {\bibrangedash} + {\bibclosebracket\bibrangedash\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% % More bracket removal required \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ieee.tlpobj new/tlpkg/tlpobj/biblatex-ieee.tlpobj --- old/tlpkg/tlpobj/biblatex-ieee.tlpobj 2016-05-10 23:42:08.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-ieee.tlpobj 2017-04-14 17:31:52.000000000 +0200 @@ -1,21 +1,23 @@ name biblatex-ieee category Package -revision 40983 -shortdesc Ieee style files for BibLaTeX +revision 43620 +shortdesc IEEE style files for BibLaTeX relocated 1 -longdesc This is a biblatex style that implements the bibliography style +longdesc This is a BibLaTeX style that implements the bibliography style longdesc of the IEEE for BibLaTeX. The implementation follows standard longdesc BibLaTeX conventions, and can be used simply by loading longdesc BibLaTeX with the appropriate option: longdesc \usepackage[style=ieee]{biblatex} A demonstration database is -longdesc provided to show how to format input for the style. +longdesc provided to show how to format input for the style. biblatex- +longdesc ieee requires BibLaTeX 2.7 or later, and works with both BibTeX +longdesc and Biber as the database back-end. runfiles size=8 RELOC/tex/latex/biblatex-ieee/ieee-alphabetic.bbx RELOC/tex/latex/biblatex-ieee/ieee-alphabetic.cbx RELOC/tex/latex/biblatex-ieee/ieee.bbx RELOC/tex/latex/biblatex-ieee/ieee.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ieee -catalogue-date 2016-05-08 23:53:04 +0200 +catalogue-date 2017-03-27 08:43:12 +0200 catalogue-license lppl1.3 catalogue-topics biblatex journalpub -catalogue-version 1.1n +catalogue-version 1.2d ++++++ biblatex-iso690.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-iso690/README new/doc/latex/biblatex-iso690/README --- old/doc/latex/biblatex-iso690/README 2016-05-15 00:10:23.000000000 +0200 +++ new/doc/latex/biblatex-iso690/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -Style ISO 690 for biblatex -========================== - -Biblatex is bibliography and citation tool for LaTeX. This project provides -support for citations in ISO 690 style. As the norm is a little bit ambiguous -in some details regarding formatting of records, we largely follow -requirements of Czech interpretation, as it is required form in many Czech -universities. Style can be used in other languages as well, of course. - -Install -------- - -Open the terminal and find location of your TEXMFHOME directory with this command. - - kpsewhich -var-value TEXMFHOME - -Open this directory using and check that directory $TEXMFHOME/tex/latex exists. -If it doesn't exist, you must create it. You can do this from the -command line or using a file manager. Open the $TEXMFHOME/tex/latex directory and either -run command - - git clone git@github.com:michal-h21/biblatex-iso690.git - -or unzip file - - https://github.com/michal-h21/biblatex-iso690/archive/master.zip - -here. You should be able to use biblatex-iso690 now. - - - -Usage: ------- -... -\usepackage[english,czech]{babel} % main language of the document must be last -\usepackage[ - backend=biber % if we want unicode - ,style=iso-authoryear % or iso-numeric for numeric citation method - ,autolang=other % to support multiple languages in bibliography - ,sortlocale=cs_CZ % locale of main language, it is for sorting - ,bibencoding=UTF8 % this is necessary only if bibliography file is in different encoding than main document -]{biblatex} -... - -Custom options: - spacecolon - add space before colon in publisher and title: - [true] Praha : Academia - [false] Praha: Academia - -Bibliographic fields: -Some fields have different meaning than in plain BibTeX. - -1. if publication is written in other language than the main document is, it should have filled "langid" field - - langid = {czech} - -2. publications with online versions should have "urldate" field. it is date when you last checked publication online - - urldate = {2011-01-12}, - -3. if publication has more isbn or issn numbers, use just one of them - -4. publisher and place - - location = {Praha}, - publisher = {Academia} - -For more details see file mybib.bib - -License -------- - -GNU/GPL 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-iso690/README.md new/doc/latex/biblatex-iso690/README.md --- old/doc/latex/biblatex-iso690/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-iso690/README.md 2017-04-27 00:45:55.000000000 +0200 @@ -0,0 +1,104 @@ +# Biblatex style for ISO 690 standard + +Biblatex is a bibliography and citation tool for LaTeX. This project provides +support for citations in ISO 690 style. As the standard is a little bit ambiguous +in some details regarding formatting of records, we largely follow +requirements of Czech interpretation, as it is required form in many Czech +universities. The style can be used in other languages as well, of course. + +## Install + +Open the terminal and find location of your `TEXMFHOME` directory with this command: + + kpsewhich -var-value TEXMFHOME + +Open this directory and check that the directory `$TEXMFHOME/tex/latex` exists. +If it doesn't exist, you must create it. You can do this from the +command line or using a file manager. Open the `$TEXMFHOME/tex/latex` directory and either +run the command + + git clone git@github.com:michal-h21/biblatex-iso690.git + +or unzip the file + + https://github.com/michal-h21/biblatex-iso690/archive/master.zip + +here. You should be able to use **biblatex-iso690** now. + +## Usage: +``` +\usepackage[english,czech]{babel} % main language of the document must be last +\usepackage[ + backend=biber % if we want unicode + ,style=iso-authoryear % or iso-numeric for numeric citation method + ,autolang=other % to support multiple languages in bibliography + ,sortlocale=cs_CZ % locale of main language, for sorting + ,bibencoding=UTF8 % this is necessary only if bibliography file is in different encoding than main document +]{biblatex} +``` + +### Custom options + +Above and beyond the scope of package options provided by `biblatex` itself, here are also some more. Default values are in **bold**. + +* `spacecolon` + add space before colon in publisher and title (and also title and subtitle): + * [true] Praha : Academia + * **[false]** Praha: Academia +* `pagetotal` + print out total number of pages as an additional information in the notes section: + * [true] Praha: Academia, 2008 [60 p.] + * **[false]** Praha: Academia, 2008 +* `shortnumeration` + visually distinguish numeration and pagination section: + * [true] ... 2011, **32**(3), 289–301 [visited on 2016-05-14] ... + * **[false]** ... 2011, vol. 32, no. 3, pp. 289–301 [visited on 2016-05-14] ... +* `thesisinfoinnotes` + print out thesis information in notes section + * **[true]** Available from: <...>. BP. MU, FI, Brno. Supervisor Petr SOJKA + * [false] BP. MU, FI, Brno. Supervisor Petr SOJKA. Available from: <...> + +### Bibliographic fields +Some fields have a different meaning than in plain BibTeX. + +1\. If the publication is written in a different language to the main document, it should have a filled `langid` field. +``` +langid = {czech} +``` + +2\. Publications with online versions should have a `urldate` field. It is the date when you last checked the publication online. +``` +urldate = {2011-01-12} +``` + +3\. If the publication has more than one ISBN or ISSN number, use just one of them. + +4\. Publisher and place: +``` +location = {Praha}, +publisher = {Academia} +``` + +For more details see the file [mybib.bib](https://github.com/michal-h21/biblatex-iso690/blob/master/mybib.…. + +## License + +Copyright (C) 2011--2017 Michal Hoftich + 2015--2017 Moritz Wemheuer + 2016--2017 Dávid Lupták + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + + http://www.latex-project.org/lppl.txt + +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +This work has the LPPL maintenance status `maintained`. + +The Current Maintainer of this work is Michal Hoftich. + +This work consists of all files listed in [manifest.txt](./manifest.txt). Binary files old/doc/latex/biblatex-iso690/biblatex-iso690.pdf and new/doc/latex/biblatex-iso690/biblatex-iso690.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-iso690/biblatex-iso690.tex new/doc/latex/biblatex-iso690/biblatex-iso690.tex --- old/doc/latex/biblatex-iso690/biblatex-iso690.tex 2016-05-15 00:10:23.000000000 +0200 +++ new/doc/latex/biblatex-iso690/biblatex-iso690.tex 2017-04-27 00:45:55.000000000 +0200 @@ -34,7 +34,7 @@ url={https://github.com/michal-h21/biblatex-iso690}, author={Michal Hoftich}, email={michal.h21(a)gmail.com}, - revision={0.3.1}, + revision={0.3.2}, date={\today}} \hypersetup{% @@ -55,22 +55,22 @@ \biblatex is a bibliography and citation tool for \LaTeX. This project provides support for citations and references according to the ISO~690 international standard. As the norm ISO~690 is a little bit ambiguous in some details regarding formatting of records, -we largely follow requirements of Czech interpretation, as it is required form -in many Czech universities. Of course, style can be used in other languages as well. +we largely follow requirements of the Czech interpretation, as it is the required form +in many Czech universities. Of course, the style can be used in other languages as well. \subsection{Requirements} Basically, \biblatex $\geq$ 3.4 with \biber $\geq$ 2.5 is all you need to use this package. -No special packages different from those required by \biblatex package are used. For complete +No special packages different from those required by the \biblatex package are used. For a complete list of such packages, please refer to the \biblatex documentation. \subsection{License} -This project is released under GNU/GPL 3\footnote{\url{http://www.gnu.org/licenses/gpl.txt}} license. +This project is released under the LaTeX Project Public License\footnote{\url{http://www.latex-project.org/lppl.txt}}. \subsection{Acknowledgments} -Thanks to all contributors who have participated on the development of this style, +Thanks to all contributors who have participated in the development of this style, especially Johannes Böttcher, Moewew, Dávid Lupták and others. \subsection{Feedback} @@ -84,8 +84,8 @@ \begin{verbatim} .. -\usepackage[english,czech]{babel} -% or in case of using xelatex, use polyglossia package instead +\usepackage[english,czech]{babel} % [other,main] +% or in case of using xelatex, use the 'polyglossia' package instead \usepackage{polyglossia} \setmainlanguage{czech} \setotherlanguage{english} @@ -105,15 +105,41 @@ According to the ISO~690 norm, some of the elements of the bibliographic resource should be printed in the main document language (language I~am -currently writing) while the others in the language of a resource. You can -specify the language of a resource into the field \t|langid| on the per-entry +currently writing) while the others should be in the language of a resource. You can +specify the language of a resource into the field \t|langid| on a per-entry basis in a resource (\t|.bib|) file. In addition, all of the languages -specified in these fields have to be loaded by \t|babel| or \t|polyglossia| +specified in these fields have to be loaded by the \t|babel| or \t|polyglossia| package respectively.\label{gen:multilang} Note that for correct support of localization functionality, the \t|babel| -package should be used. The main document language is the last one entered -in a list of languages passed to this package. +or \t|polyglossia| package should be used. The main document language +is the last one entered in a list of languages passed to the \t|babel| package, +respectively the directives \t|\textbackslash setmainlanguage| and +\t|\textbackslash setotherlanguage| in case the \t|polyglossia| package +is used. + +\subsection{Citation methods} + +The international standard ISO 690 prescribes exactly 3 methods of +citation. However, based on the user input, this package contains +more of them. + +\subsubsection{Official methods} + +\begin{description} +\item[iso-authoryear] name and date system, so-called Harvard style +\item[iso-numeric] numeric system +\end{description} + +There is also one more system of running notes, which is not +implemented yet. + +\subsubsection{Unofficial methods} + +\begin{description} +\item[iso-alphabetic] alphabetic system +\item[iso-authortitle] name and title system +\end{description} \subsection{Package options} @@ -123,39 +149,40 @@ \begin{description} \item[style] style to be used for bibliographic references and citations. -Three possibilities are available, \t|iso-authoryear| commonly known as -Harvard system, \t|iso-numeric| as a numeric system and \t|iso-authortitle|. +Four possibilities are available, \t|iso-authoryear| commonly known as +“Harvard system”, \t|iso-numeric| as a numeric system, \t|iso-alphabetic| +and \t|iso-authortitle|. \item[backend] backend program for generating bibliographic entries. \biber -is the default one for \biblatex package, providing a big variety -of features. Another options are \t|bibtex| and \t|bibtex8|, but they both +is the default one for the \biblatex package, providing a large variety +of features. Other options are \t|bibtex| and \t|bibtex8|, but they both are far behind the possibilities of \biber. \biber is the recommended backend. \item[autolang] controls which language environment is used. The most significant value is \t|other|, which supports printing localization -terms in language of resource or language specific hyphenation. Default -value is \t|none|, which disables this feature. +terms in the language of the resource or language specific hyphenation. +Default value is \t|none|, which disables this feature. \item[sortlocale] responsible for sorting the bibliography according to the -entered \t|locale| language identifier. The main document language one should -be set. +entered \t|locale| identifier. It should usually be set to one using the +main document language, e.g. \t|en\_IN| for English as used in India. -\item[bibencoding] specifies the encoding of the \t|bib| files. \t|<encoding>| -needs to be explicitly specified only if the encoding of the \t|bib| file -is different from the one of the \t|tex| file. Default value is \t|auto|, i.e. -the encoding of the \t|bib| file is identical to the encoding of the \t|tex| -file. +\item[bibencoding] specifies the character encoding of the \t|bib| files. +\t|<encoding>| needs to be explicitly specified only if the encoding of the +\t|bib| file is different from the one of the \t|tex| file. Default value +is \t|auto|, i.e. the encoding of the \t|bib| file is identical to the +encoding of the \t|tex| file. \end{description} \subsubsection{Provided by \t|biblatex-iso690| in addition} \begin{description} - \item[spacecolon] if \t|true|, the space is printed before the colon + \item[spacecolon] if \t|true|, a space is printed before the colon used in subtitles and publication information. Printing the colon this way is not recommended. Default value is \t|false|. - \item[pagetotal] number of total pages is no longer required if the item - is being cited as a whole. Setting this option to \t|true| will print + \item[pagetotal] the number of total pages is no longer required if the + item is being cited as a whole. Setting this option to \t|true| will print such optional information in the notes section at the end of the reference. Default value is \t|false|.\label{pkg:opt:iso690:pp} @@ -166,10 +193,10 @@ parentheses). If \t|false|, such terms are printed with preceding literal terms. - \item[thesisinfolast] whether or not to print information about - thesis (i.e. type, institution or supervisor) in the note section - is ambiguous, print it before the section \textit{availability - and access} is possible by setting this option to \t|false|. + \item[thesisinfoinnotes] to print a thesis information + (thesis type, institution and supervisor) before the section + \textit{availability and access} is possible by setting the option + to \t|false|. Otherwise it will be printed in the \textit{notes} section. Default value is \t|true|. \end{description} @@ -190,7 +217,7 @@ year = {2003}, title = {From Gutenberg to the global information infrastructure}, subtitle = {access to information in the networked world}, - edition = {1}, % should be not stated + edition = {1}, % should not be stated location = {Cambridge (Mass)}, publisher = {The MIT Press}, pagetotal = {xviii, 324}, @@ -199,14 +226,14 @@ } \end{verbatim} -The \t|edition| field is edition of a printed publication. It's required -if the item is not a first edition. Use integer or literal string to fill in -this field. - -The \t|pagetotal| field is total number of pages of the work. If multiple -kinds of numeration is used in the work, e.g. arabic as well as roman numerals, -both can be provided, separated by a comma. Only for arabic numerals -the localization term \t|pages| is appended. Note that total number of pages +The \t|edition| field is the edition of a printed publication. It is required +if the item is not a first edition. Use an integer or a literal string to fill +in this field. + +The \t|pagetotal| field is the total number of pages of the work. If multiple +kinds of numeration are used in the work, e.g. arabic as well as roman numerals, +both can be provided, separated by a comma. The localization term \t|pages| is +only appended for arabic numerals, though. Note that the total number of pages is no longer required by the norm itself, see also \ref{pkg:opt:iso690:pp}. The \t|langid| field is required for multilingual support of printing @@ -234,16 +261,16 @@ } \end{verbatim} -The \t|title| field is title of the contribution, the \t|booktitle| -is title of the collection. +The \t|title| field is the title of the contribution, the \t|booktitle| +is the title of the collection. The \t|pages| field is one or more page numbers or page ranges. This field is essential since the reference should identify the part of the item that is cited. -It's also possible to use the cross-referencing feature to reference +It is also possible to use the cross-referencing feature to reference from a contribution entry (child entry) to a separate entry of a collection -(parent entry). This can be done by the field \t|crossref| +(parent entry). This can be done with the \t|crossref| field as the following example shows: \newline @@ -270,7 +297,7 @@ Now, there is no need to fill in \t|booktitle| in the \t|sbornik| entry. The \t|biber| backend program performs the inheritance between parent and -child entry automatically. +child entry automatically. Other backends may not support this feature. \paragraph{Article in a serial}\hfill\\ @@ -291,7 +318,7 @@ } \end{verbatim} -The example above is an article in online magazine. If the magazine +The example above is an article in an online magazine. If the magazine is available online only, i.e. it is not published in print, it should be cited as an electronic information resource. This can be achieved by providing the \t|urldate| field. On the other hand @@ -320,18 +347,18 @@ } \end{verbatim} -\noindent the example shows an article in printed magazine, which is also -available online. Similar to the contribution to a collection, -using cross-referencing feature can be of benefit. +\noindent the example shows an article in a printed magazine, which is +\emph{also} available online. Similar to the contribution to a collection, +using cross-referencing feature can be beneficial. \subsubsection{Specific entry types} \paragraph{Thesis}\hfill\\ -The entry type \t|thesis| and its aliases \t|mastersthesis| and +The \t|thesis| entry type and its aliases \t|mastersthesis| and \t|phdthesis| are available by default for thesis works. Use the -\t|type| field to specify the type of the thesis -- localization -term or literal string could be entered. For the list of supported +\t|type| field to specify the type of the thesis -- a localization +term or literal string can be entered. For the list of supported localization terms, please refer to section 4.9.2.13 of the \t|biblatex| documentation. Names of the supervisor and school (institution) can be entered into the fields \t|supervisor| and @@ -345,30 +372,30 @@ \subsection{Hints and Caveats} -This section provides additional hints concerning \t|biblatex| package -as well as ISO~690 standard. +This section provides additional hints concerning the \t|biblatex| package +as well as the ISO~690 standard. -For now, some of the things has to be dealt with at the level of \t|bib| -file, another ones are directly addressed in this style package. +For now, some of the things have to be dealt with at the level of the +\t|bib| file, other ones are directly addressed in this style package. Everything else relies on the \t|biblatex| package, so please also refer to the \t|biblatex| documentation. \subsubsection{Creators} The persons or organizations responsible for the cited work should be -primarily given into the \t|author| field. If it's not appropriate, -another fields like \t|editor| and \t|editorx| family fields or some +primarily given in the \t|author| field. If it is not appropriate, +other fields like \t|editor| and \t|editorX| family fields or some specific ones (e.g. \t|translator|) can be used. Note also the field -\t|editortype| and \t|editortypex| family fields which can be used -to specify type of the editor. This is useful to distinguish the role -of the creator and its relationship to the cited work. Some roles -are supported by default, e.g. \t|editor|, \t|compiler|, \t|founder|, -\t|reviser|, etc., in other cases the literal string can be entered. +\t|editortype| and \t|editortypeX| family fields which can be used +to specify the type of the editor. This is useful to distinguish the role +of the creator and their relationship to the cited work. Some roles +are supported by default, e.g. \t|editor|, \t|compiler|, \t|founder| +and \t|reviser|, in other cases the literal string can be entered. Example: -When citing cinematographic works which are typically output of many -individuals, title should be used as the first element of the reference. -However, it's appropriate to include some relevant roles, e.g. director: +When citing cinematographic works which are typically the output of many +individuals, the title should be used as the first element of the reference. +However, it is appropriate to include some relevant roles, e.g. the director: %\begin{ltxexample} \begin{verbatim} @@ -393,13 +420,13 @@ in Slovak. The field \t|nameaddon| can be used to append additional information -to the creator's name, e.g. variant forms of a name, name additions, -pseudonyms, etc. This field is printed as is, in square brackets after -creator's name. - -For anonymous works cited by author-year method, the term \textit{Anon} -should be used instead of creator's name. Please, reflect this -in \t|bib| file, since there is no other support for this for now. +to the creator's name, e.g. variant forms of a name, name additions +or pseudonyms. This field is printed as is, in square brackets after +the creator's name. + +For anonymous works cited by the author-year method, the term \textit{Anon} +should be used in place of the creator's name. Please reflect this +in the \t|bib| file, since there is no other support for this for now. \subsubsection{Titles} @@ -413,15 +440,15 @@ \subsubsection{Medium type} The field \t|howpublished| is used for providing information about -medium designation or type of medium. Default value for electronic +the medium designation or type of medium. Default value for electronic information resources is \t|online|. This field is printed as is, in square brackets after title section, generally. \subsubsection{Edition} -The \t|edition| field is edition of a publication. It's required -if the item is not a first edition. Use integer or literal string -to fill in this field. Please reflect the constraint, not to print +The \t|edition| field is the edition of a publication. It is required +if the item is not a first edition. Use an integer or a literal string +to fill in this field. Please reflect the constraint not to print the edition if the cited item is a first edition, by not providing this field in the \t|bib| file. @@ -431,8 +458,8 @@ \subsubsection{Date} In case no date is given and also no approximation is possible, that -should be stated. Please reflects this in \t|bib| file by including -the following line into the respective entry. +should be stated. Please reflect this in the \t|bib| file by including +the following line in the respective entry. \begin{verbatim} .. @@ -441,21 +468,21 @@ \end{verbatim} Explanation of the above code: -\t|nodate| is localization string which prints something like +\t|nodate| is a localization string which prints something like \textit{n.d.}, \textit{b.r.}, etc. depending on the language, -\t|bibsstring| is a command to use such localization term and -\t|mkbibbrackets| is a command used to wrap it's argument into -the square brackets. Finally, this statement is entered into +\t|bibsstring| is a command to use such localization terms and +\t|mkbibbrackets| is a command used to wrap its argument into +square brackets. Finally, this statement is entered into the date entry field to be available as a date in a reference. -So as a result we get e.g. \textit{[n.d.]}, which conforms +So as a result we get e.g. \textit{[n.d.]}, which conforms to the standard. Please also note the syntax for dates -- ISO 8601 format (YYYY-MM-DD) is accepted. Please use slash instead of any kind of dash for ranges of dates. If the range is open ended, enter just the first date followed by a slash. -And last, but not least, use \t|date| field instead of -the \t|year| in general. +And last, but not least, use the \t|date| field instead of +the \t|year| field in general. Examples follow: @@ -467,8 +494,8 @@ \subsubsection{Location} -If only limited number of copies of the work exists or -location of graphic work is essential to its identification, +If only a limited number of copies of the work exists or +the location of a graphic work is essential to its identification, such location (e.g. library or repository) should be stated in a reference. The field \t|library| serves for this purpose. @@ -480,6 +507,15 @@ \begin{changelog} +\begin{release}{0.3.2}{2016-04-25} +\item Synchronized \t|iso-numeric| bibliography environment with original \t|numeric| style +\item Added support for alphabetic bibliographic style (\t|iso-alphabetic|) +\item Incompatible change: \t|thesisinfolast| package option changed to \t|thesisinfoinnotes| +\item README copyediting and conversion to markdown +\item Various doc and README corrections and enhancements +\item Added German localization +\end{release} + \begin{release}{0.3.1}{2016-05-13} \item Added support for entry types \t|thesis| and \t|patent| \item Added support for including location information (\t|library| field) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-iso690/mybib.bib new/doc/latex/biblatex-iso690/mybib.bib --- old/doc/latex/biblatex-iso690/mybib.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-iso690/mybib.bib 2017-04-27 00:45:55.000000000 +0200 @@ -0,0 +1,194 @@ +% This file was created with JabRef 2.6. +% Encoding: UTF8 +@ONLINE{t00, + editor = {Bratková, Eva}, + editortype={compiler}, + title = {Metody citování literatury a strukturování bibliografických záznamů podle mezinárodních norem ISO 690 a ISO 690-2}, + subtitle = {metodický materiál pro autory vysokoškolských kvalifikačních prací}, edition = {Verze 2.0, aktualiz. a rozšíř.}, + location = {Praha}, + publisher = {Odborná komise pro otázky elektronického zpřístupňování vysokoškolských kvalifikačních prací, Asociace knihoven vysokých škol ČR}, + date = {2008-12-22}, + pagetotal = {60}, + url = {http://www.evskp.cz/SD/4c.pdf}, + urldate = {2011-02-02}, + langid={czech} +} + +@BOOK{t01, + author = {Borgman, Christine L.}, + year={2003}, + title = {From Gutenberg to the global information infrastructure}, + subtitle = {access to information in the networked world}, + edition= {1}, % should not be stated + location = {Cambridge (Mass)}, + publisher = {The MIT Press}, + pagetotal = {xviii, 324}, + isbn = {0-262-52345-0}, + langid={english} +} + +@INCOLLECTION{t02, + author = {Greenberg, David}, + year = {1998}, + title = {Camel drivers and gatecrashers}, + subtitle = {quality control in the digital research library}, + editor = {Hawkins, B.L and Battin, P}, + booktitle = {The mirage of continuity}, + booksubtitle = {reconfiguring academic information resources for the 21st century}, + location = {Washington (D.C.)}, + publisher = {Council on Library and Information Resources; Association of American Universities}, + pages = {105-116}, + langid = {english} +} + +@ARTICLE{t03, + author = {LYNCH, C.}, + year = {2005}, + title = {Where do we go from here?}, + subtitle = {the next decade for digital libraries}, + journaltitle = {DLib Magazine}, + volume = {11}, + number = {7/8}, + urldate ={2005-08-15}, + url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, + issn = {1082-9873}, + langid = {english} +} + +@ARTICLE{cr, + author = {{Národní knihovna}}, + title = {A big paper}, + journaltitle = {The journal of big papers}, + year = {1991}, + volume = {12}, + number = {3}, + issn={2232-332X}, + langid={english} +} + +@BOOK{kniha, + title = {A big paper}, + subtitle={Podtitul}, + publisher = {Academia}, + year = {1991}, + author = {Děťa, Hugh and Rychlík, Tomáš}, + edition = {2}, + pagetotal = {550}, + location = {Praha}, + series={Pokusná edice}, + isbn={978-44-55-X}, + url={http://pokus.cz}, + comment={Dostupné také z WWW}, + urldate = {2011-01-12}, + langid={czech} +} + +@BOOK{kniha2, + title = {Úplně úžasná knížka}, + year = {1991}, + author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, + edition = {3}, + address = {Praha}, + langid={czech} +} + +@BOOK{kniha3, + title = {Úplně úžasná knížka}, + year = {1991}, + author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, + edition = {3}, + publisher={MIT Press}, + address = {Praha}, + pagetotal={332}, + langid={english} +} + +@ARTICLE{small, + author = {Freely, I.P.}, + title = {A small paper}, + subtitle = {Podtitulek}, + journaltitle = {The journal of small papers}, + year = {1997}, + volume = {1}, + note = {to appear}, + pages={2-5}, + number={3}, + langid={czech} +} + +@ARTICLE{big, + author = {Jass, Hugh}, + title = {A big paper}, + journal = {The journal of big papers}, + year = {1991}, + volume = {23} +} + +@ARTICLE{cs, + COMMENT_OUTauthor = {Černý, Hugh}, + title = {Titulek}, + journal = {The journal of big papers}, + year = {1991}, + volume = {12}, + pages = {22-44}, + doi = {10.112.22/jkn}, + number = {2}, +} + +@BOOK{koll, + author = {Kollmannová, Ludmila and Bubeníková, Libuše and Kopecká, Alena}, + title = {Angličtina pro samouky}, + edition = {5}, + location = {Praha}, + publisher = {Státní pedagogické nakladatelství}, + year = {1977}, + pagetotal = {525}, + series = {Učebnice pro samouky}, + number = {4}, + isbn = {80-04-25663-5} +} + +@INBOOK{kap, + author = {Novotná, Pepina}, + title = {Podkapitola}, + pages = {22-29}, + chapter = {2.}, + crossref = {koll} +} + +@PERIODICAL{tug, + journaltitle = {TUGBoat}, + publisher = {TUG}, + issn = {1222-3333}, + langid = {english}, + date = {1980/}, + options = {skipbib=true}, + url={http://tugboat.tug.org/} +} + +@ARTICLE{knuth, + author = {Knuth, Donald}, + title = {Journeys of \TeX}, + volume = {17}, + number = {3}, + year = {2003}, + pages = {12-22}, + url = {http://tugboat.tug.org/kkk.pdf}, + crossref={tug} +} + +@COLLECTION{sbornik, +title = {Mimořádně užitečný sborník}, +editor = {Geniální, Jiří}, +year = {2007}, +langid = {czech}, +location = {Praha}, +publisher = {Academia}, +isbn = {978-222-626-222-2} +} +@INCOLLECTION{prispevek1, +crossref = {sbornik}, +title = {Velmi zajímavý článek}, +author = {Vlaštovka, Josef}, +pages = {22-45} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-iso690.doc.tlpobj new/tlpkg/tlpobj/biblatex-iso690.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-iso690.doc.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-iso690.doc.tlpobj 2017-04-28 02:07:24.000000000 +0200 @@ -1,9 +1,10 @@ name biblatex-iso690.doc category Package -revision 41148 +revision 44066 shortdesc doc files of biblatex-iso690 relocated 1 -docfiles size=47 - RELOC/doc/latex/biblatex-iso690/README +docfiles size=49 + RELOC/doc/latex/biblatex-iso690/README.md RELOC/doc/latex/biblatex-iso690/biblatex-iso690.pdf RELOC/doc/latex/biblatex-iso690/biblatex-iso690.tex + RELOC/doc/latex/biblatex-iso690/mybib.bib ++++++ biblatex-iso690.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/czech-iso.lbx new/tex/latex/biblatex-iso690/czech-iso.lbx --- old/tex/latex/biblatex-iso690/czech-iso.lbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/czech-iso.lbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,5 +1,5 @@ \ProvidesFile{czech-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{czech} \InheritBibliographyStrings{czech} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/english-iso.lbx new/tex/latex/biblatex-iso690/english-iso.lbx --- old/tex/latex/biblatex-iso690/english-iso.lbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/english-iso.lbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,5 +1,5 @@ \ProvidesFile{english-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/german-iso.lbx new/tex/latex/biblatex-iso690/german-iso.lbx --- old/tex/latex/biblatex-iso690/german-iso.lbx 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/biblatex-iso690/german-iso.lbx 2017-04-27 00:45:55.000000000 +0200 @@ -0,0 +1,16 @@ +\ProvidesFile{german-iso.lbx} +[2017/04/25 v0.3.2 biblatex localization] + +\InheritBibliographyExtras{german} +\InheritBibliographyStrings{german} + +\DeclareBibliographyStrings{% + at = {{Standort} + {Standort}}, + bysupervisor = {{betreut von}% maybe Betreuer, but gender-dependent then, female: Betreuerin + {betreut von}}, + urlalso = {{auch verf\"{u}gbar unter} + {auch verf\"{u}gbar unter}}, +} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-alphabetic.bbx new/tex/latex/biblatex-iso690/iso-alphabetic.bbx --- old/tex/latex/biblatex-iso690/iso-alphabetic.bbx 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/biblatex-iso690/iso-alphabetic.bbx 2017-04-27 00:45:55.000000000 +0200 @@ -0,0 +1,46 @@ +\ProvidesFile{alphabetic.bbx} +[2017/04/25 v0.3.2 biblatex citation style] + +% This is a copy of alphabetic.bbx +% It only uses iso as base style, instead of standard + +\RequireBibliographyStyle{iso} +\ExecuteBibliographyOptions{labelalpha,sorting=nyt} % was sorting anyt + +\DeclareNameAlias{author}{default} +\DeclareNameAlias{editor}{default} +\DeclareNameAlias{translator}{default} + +\DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}} +\DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} + +\defbibenvironment{bibliography} + {\list + {\printtext[labelalphawidth]{% + \printfield{labelprefix}% + \printfield{labelalpha}% + \printfield{extraalpha}}} + {\setlength{\labelwidth}{\labelalphawidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}}% + \renewcommand*{\makelabel}[1]{##1\hss}} + {\endlist} + {\item} + +\defbibenvironment{shorthand} + {\list + {\printfield[shorthandwidth]{shorthand}} + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-alphabetic.cbx new/tex/latex/biblatex-iso690/iso-alphabetic.cbx --- old/tex/latex/biblatex-iso690/iso-alphabetic.cbx 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/biblatex-iso690/iso-alphabetic.cbx 2017-04-27 00:45:55.000000000 +0200 @@ -0,0 +1,6 @@ +\ProvidesFile{iso-alphabetic.cbx} +[2017/04/25 v0.3.2 biblatex citation style] + +\RequireCitationStyle{alphabetic} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authortitle.bbx new/tex/latex/biblatex-iso690/iso-authortitle.bbx --- old/tex/latex/biblatex-iso690/iso-authortitle.bbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authortitle.bbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-authortitle.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authortitle.cbx new/tex/latex/biblatex-iso690/iso-authortitle.cbx --- old/tex/latex/biblatex-iso690/iso-authortitle.cbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authortitle.cbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-authortitle.cbx}[2017/04/25 v0.3.2 biblatex citation style] \ExecuteBibliographyOptions{% maxcitenames=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authortitle.dbx new/tex/latex/biblatex-iso690/iso-authortitle.dbx --- old/tex/latex/biblatex-iso690/iso-authortitle.dbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authortitle.dbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-authortitle.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authoryear.bbx new/tex/latex/biblatex-iso690/iso-authoryear.bbx --- old/tex/latex/biblatex-iso690/iso-authoryear.bbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authoryear.bbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-authoryear.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authoryear.cbx new/tex/latex/biblatex-iso690/iso-authoryear.cbx --- old/tex/latex/biblatex-iso690/iso-authoryear.cbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authoryear.cbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-authoryear.cbx}[2017/04/25 v0.3.2 biblatex citation style] \ExecuteBibliographyOptions{% maxcitenames=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-authoryear.dbx new/tex/latex/biblatex-iso690/iso-authoryear.dbx --- old/tex/latex/biblatex-iso690/iso-authoryear.dbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-authoryear.dbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-authoryear.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-numeric.bbx new/tex/latex/biblatex-iso690/iso-numeric.bbx --- old/tex/latex/biblatex-iso690/iso-numeric.bbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-numeric.bbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-numeric.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% @@ -18,15 +18,17 @@ \printfield{prefixnumber}% \printfield{labelnumber}}}}% +% Copy-pasted from 'numeric.bbx' \defbibenvironment{bibliography} {\list% {\MethodFormat}% - {\setlength{\leftmargin}{\bibhang}% - \setlength{\itemindent}{-\leftmargin}% + {\setlength{\labelwidth}{\labelnumberwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}% \renewcommand*{\makelabel}[1]{\hss##1} - %\raggedright} }% {\endlist}% {\item}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-numeric.cbx new/tex/latex/biblatex-iso690/iso-numeric.cbx --- old/tex/latex/biblatex-iso690/iso-numeric.cbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-numeric.cbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-numeric.cbx}[2017/04/25 v0.3.2 biblatex citation style] \RequireCitationStyle{numeric} \RequireCitationStyle{iso-fullcite} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso-numeric.dbx new/tex/latex/biblatex-iso690/iso-numeric.dbx --- old/tex/latex/biblatex-iso690/iso-numeric.dbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso-numeric.dbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-numeric.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/iso.bbx new/tex/latex/biblatex-iso690/iso.bbx --- old/tex/latex/biblatex-iso690/iso.bbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/iso.bbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,8 +1,9 @@ -\ProvidesFile{iso.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \DeclareLanguageMapping{czech}{czech-iso} \DeclareLanguageMapping{english}{english-iso} \DeclareLanguageMapping{slovak}{slovak-iso} +\DeclareLanguageMapping{german}{german-iso} \NewBibliographyString{at,bysupervisor,urlalso} %options @@ -22,9 +23,9 @@ \settoggle{bbx:shortnum}{#1}% \typeout{Short numeration enabled: #1}} -\newtoggle{bbx:thesisinfolast} -\DeclareBibliographyOption{thesisinfolast}[true]{% - \settoggle{bbx:thesisinfolast}{#1}% +\newtoggle{bbx:thesisinfoinnotes} +\DeclareBibliographyOption{thesisinfoinnotes}[true]{% + \settoggle{bbx:thesisinfoinnotes}{#1}% \typeout{Printing thesis info at the end enabled: #1}} @@ -32,14 +33,15 @@ spacecolon=false ,pagetotal=false ,shortnumeration=false - ,thesisinfolast=true + ,thesisinfoinnotes=true %sorting=nyt ,maxnames=9 ,minnames=1 ,citetracker=true %,autolang=other ,date=year - ,urldate=iso8601 + ,urldate=edtf + ,seconds=true } \newbibmacro*{begentry}{} @@ -730,7 +732,7 @@ \newunit\newblock% \usebibmacro{identifier}% \newunit\newblock% -\iftoggle{bbx:thesisinfolast} +\iftoggle{bbx:thesisinfoinnotes} {} {\printfield{type} \newunit\newblock% @@ -744,7 +746,7 @@ {\printfield{pagetotal}} {}% \newunit\newblock% -\iftoggle{bbx:thesisinfolast} +\iftoggle{bbx:thesisinfoinnotes} {\printfield{type} \newunit\newblock% \printlist{institution}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/mybib.bib new/tex/latex/biblatex-iso690/mybib.bib --- old/tex/latex/biblatex-iso690/mybib.bib 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/mybib.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -% This file was created with JabRef 2.6. -% Encoding: UTF8 -@ONLINE{t00, - editor = {Bratková, Eva}, - editortype={compiler}, - title = {Metody citování literatury a strukturování bibliografických záznamů podle mezinárodních norem ISO 690 a ISO 690-2}, - subtitle = {metodický materiál pro autory vysokoškolských kvalifikačních prací}, edition = {Verze 2.0, aktualiz. a rozšíř.}, - location = {Praha}, - publisher = {Odborná komise pro otázky elektronického zpřístupňování vysokoškolských kvalifikačních prací, Asociace knihoven vysokých škol ČR}, - date = {2008-12-22}, - pagetotal = {60}, - url = {http://www.evskp.cz/SD/4c.pdf}, - urldate = {2011-02-02}, - langid={czech} -} - -@BOOK{t01, - author = {Borgman, Christine L.}, - year={2003}, - title = {From Gutenberg to the global information infrastructure}, - subtitle = {access to information in the networked world}, - edition= {first}, - location = {Cambridge (Mass)}, - publisher = {The MIT Press}, - pagetotal = {xviii, 324}, - isbn = {0-262-52345-0}, - langid={english} -} - -@INCOLLECTION{t02, - author = {Greenberg, David}, - year = {1998}, - title = {Camel drivers and gatecrashers}, - subtitle = {quality control in the digital research library}, - editor = {Hawkins, B.L and Battin, P}, - booktitle = {The mirage of continuity}, - booksubtitle = {reconfiguring academic information resources for the 21st century}, - location = {Washington (D.C.)}, - publisher = {Council on Library and Information Resources; Association of American Universities}, - pages = {105-116}, - langid = {english} -} - -@ARTICLE{t03, - author = {LYNCH, C.}, - year = {2005}, - title = {Where do we go from here?}, - subtitle = {the next decade for digital libraries}, - journaltitle = {DLib Magazine}, - volume = {11}, - number = {7/8}, - urldate ={2005-08-15}, - url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, - issn = {1082-9873}, - langid = {english} -} - -@ARTICLE{cr, - author = {{Národní knihovna}}, - title = {A big paper}, - journaltitle = {The journal of big papers}, - year = {1991}, - volume = {12}, - number = {3}, - issn={2232-332X}, - langid={english} -} - -@BOOK{kniha, - title = {A big paper}, - subtitle={Podtitul}, - publisher = {Academia}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš}, - edition = {2}, - pagetotal = {550}, - location = {Praha}, - series={Pokusná edice}, - isbn={978-44-55-X}, - url={http://pokus.cz}, - comment={Dostupné také z WWW}, - urldate = {2011-01-12}, - langid={czech} -} - -@BOOK{kniha2, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - address = {Praha}, - langid={czech} -} - -@BOOK{kniha3, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - publisher={MIT Press}, - address = {Praha}, - pagetotal={332}, - langid={english} -} - -@ARTICLE{small, - author = {Freely, I.P.}, - title = {A small paper}, - subtitle = {Podtitulek}, - journaltitle = {The journal of small papers}, - year = {1997}, - volume = {1}, - note = {to appear}, - pages={2-5}, - number={3}, - langid={czech} -} - -@ARTICLE{big, - author = {Jass, Hugh}, - title = {A big paper}, - journal = {The journal of big papers}, - year = {1991}, - volume = {23} -} - -@ARTICLE{cs, - COMMENT_OUTauthor = {Černý, Hugh}, - title = {Titulek}, - journal = {The journal of big papers}, - year = {1991}, - volume = {12}, - pages = {22-44}, - doi = {10.112.22/jkn}, - number = {2}, -} - -@BOOK{koll, - author = {Kollmannová, Ludmila and Bubeníková, Libuše and Kopecká, Alena}, - title = {Angličtina pro samouky}, - edition = {5}, - location = {Praha}, - publisher = {Státní pedagogické nakladatelství}, - year = {1977}, - pagetotal = {525}, - series = {Učebnice pro samouky}, - number = {4}, - isbn = {80-04-25663-5} -} - -@INBOOK{kap, - author = {Novotná, Pepina}, - title = {Podkapitola}, - pages = {22-29}, - chapter = {2.}, - crossref = {koll} -} - -@PERIODICAL{tug, - journaltitle = {TUGBoat}, - publisher = {TUG}, - issn = {1222-3333}, - langid = {english}, - date = {1980/}, - options = {skipbib=true}, - url={http://tugboat.tug.org/} -} - -@ARTICLE{knuth, - author = {Knuth, Donald}, - title = {Journeys of \TeX}, - volume = {17}, - number = {3}, - year = {2003}, - pages = {12-22}, - url = {http://tugboat.tug.org/kkk.pdf}, - crossref={tug} -} - -@COLLECTION{sbornik, -title = {Mimořádně užitečný sborník}, -editor = {Geniální, Jiří}, -year = {2007}, -langid = {czech}, -location = {Praha}, -publisher = {Academia}, -isbn = {978-222-626-222-2} -} -@INCOLLECTION{prispevek1, -crossref = {sbornik}, -title = {Velmi zajímavý článek}, -author = {Vlaštovka, Josef}, -pages = {22-45} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-iso690/slovak-iso.lbx new/tex/latex/biblatex-iso690/slovak-iso.lbx --- old/tex/latex/biblatex-iso690/slovak-iso.lbx 2016-05-15 00:10:23.000000000 +0200 +++ new/tex/latex/biblatex-iso690/slovak-iso.lbx 2017-04-27 00:45:55.000000000 +0200 @@ -1,5 +1,5 @@ \ProvidesFile{slovak-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{slovak} \InheritBibliographyStrings{slovak} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-iso690.tlpobj new/tlpkg/tlpobj/biblatex-iso690.tlpobj --- old/tlpkg/tlpobj/biblatex-iso690.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-iso690.tlpobj 2017-04-28 02:07:24.000000000 +0200 @@ -1,15 +1,18 @@ name biblatex-iso690 category Package -revision 41148 +revision 44066 shortdesc BibLaTeX style for ISO 690 standard relocated 1 longdesc The package provides a bibliography and citation style which longdesc conforms to the latest revision of the international standard longdesc ISO 690:2010. The implementation follows BibLaTeX conventions -longdesc and requires biblatex >= 3.4 and biber >= 2.5. -runfiles size=20 +longdesc and requires BibLaTeX [?] 3.4 and biber [?] 2.5. +runfiles size=21 RELOC/tex/latex/biblatex-iso690/czech-iso.lbx RELOC/tex/latex/biblatex-iso690/english-iso.lbx + RELOC/tex/latex/biblatex-iso690/german-iso.lbx + RELOC/tex/latex/biblatex-iso690/iso-alphabetic.bbx + RELOC/tex/latex/biblatex-iso690/iso-alphabetic.cbx RELOC/tex/latex/biblatex-iso690/iso-authortitle.bbx RELOC/tex/latex/biblatex-iso690/iso-authortitle.cbx RELOC/tex/latex/biblatex-iso690/iso-authortitle.dbx @@ -21,10 +24,9 @@ RELOC/tex/latex/biblatex-iso690/iso-numeric.cbx RELOC/tex/latex/biblatex-iso690/iso-numeric.dbx RELOC/tex/latex/biblatex-iso690/iso.bbx - RELOC/tex/latex/biblatex-iso690/mybib.bib RELOC/tex/latex/biblatex-iso690/slovak-iso.lbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-iso690 -catalogue-date 2016-05-14 23:52:56 +0200 -catalogue-license gpl3 +catalogue-date 2017-04-26 20:10:54 +0200 +catalogue-license lppl1.3 catalogue-topics biblatex -catalogue-version 0.3.1 +catalogue-version 0.3.2 ++++++ biblatex-juradiss.doc.tar.xz ++++++ ++++++ biblatex-juradiss.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-juradiss.tlpobj new/tlpkg/tlpobj/biblatex-juradiss.tlpobj --- old/tlpkg/tlpobj/biblatex-juradiss.tlpobj 2016-04-14 18:42:20.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-juradiss.tlpobj 2017-04-14 17:31:53.000000000 +0200 @@ -4,13 +4,13 @@ shortdesc BibLaTeX stylefiles for German law thesis relocated 1 longdesc The package provides a style for use in typesetting a German -longdesc law thesis with LaTeX. The package (using biblatex) is based on +longdesc law thesis with LaTeX. The package (using BibLaTeX) is based on longdesc biblatex-dw and uses biber. runfiles size=7 RELOC/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx RELOC/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-juradiss -catalogue-date 2015-08-03 05:58:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics legal dissertation biblatex catalogue-version 0.1g ++++++ biblatex-luh-ipw.doc.tar.xz ++++++ ++++++ biblatex-luh-ipw.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-luh-ipw.tlpobj new/tlpkg/tlpobj/biblatex-luh-ipw.tlpobj --- old/tlpkg/tlpobj/biblatex-luh-ipw.tlpobj 2016-04-14 18:42:21.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-luh-ipw.tlpobj 2017-04-14 17:31:53.000000000 +0200 @@ -3,11 +3,11 @@ revision 32180 shortdesc BibLaTeX styles for social sciences relocated 1 -longdesc The bundle is a small collection of styles for biblatex. It was +longdesc The bundle is a small collection of styles for BibLaTeX. It was longdesc designed for citations in the Humanities, following the longdesc guidelines of style of the institutes for the social sciences longdesc of the Leibniz University Hannover/LUH (especially the -longdesc Institute of Political Science). The bundle depends on biblatex +longdesc Institute of Political Science). The bundle depends on BibLaTeX longdesc (version 1.1 at least) and cannot be used without it. runfiles size=11 RELOC/tex/latex/biblatex-luh-ipw/bbx/authoryear-luh-ipw.bbx @@ -19,7 +19,7 @@ RELOC/tex/latex/biblatex-luh-ipw/lbx/english-luh-ipw.lbx RELOC/tex/latex/biblatex-luh-ipw/lbx/german-luh-ipw.lbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-luh-ipw -catalogue-date 2015-08-03 05:58:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex humanities catalogue-version 0.3 ++++++ biblatex-manuscripts-philology.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib --- old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,189 @@ +%% This BibTeX bibliography file was created using BibDesk. +%% http://bibdesk.sourceforge.net/ + + +%% Created for Maïeul at 2014-04-07 15:08:51 +0200 + + +%% Saved with string encoding Unicode (UTF-8) + + + +@manuscript{C, + Address = {Cambridge}, + Annote = {Some comments }, + Bookpagination = {folio}, + Collection = {Additional greek manuscript}, + Columns = {1}, + Date-Added = {2014-04-07 12:59:25 +0000}, + Date-Modified = {2014-04-07 13:08:49 +0000}, + Dating = {\textsc{viii}-\textsc{ix}\textsuperscript{e} c.}, + Layer = {inf}, + Library = {University Library}, + Pages = {11\recto-11\verso}, + Pagetotal = {16}, + Shelfmark = {4489}, + Support = {pergament}} + +@book{Batiffoll1891, + Address = {Paris}, + Author = {Pierre Batiffol}, + Publisher = {Alphonse Picard}, + Subtitle = {contribution à l'histoire de la Vaticane}, + Title = {L'abbaye de Rossano}, + Year = {1891}} + +@book{Richard857, + Address = {Bruxelles}, + Author = {Franchi de' Cavalieri, Pio Petro}, + Publisher = {Société des Bollandistes}, + Title = {Catalogus codicum hagiographicorum graecorum Bibliothecae Vaticanae}, + Year = {1899}} + +@book{Lake1938, + Address = {Boston}, + Author = {Kirsopp Lake and Silvia Lake}, + Bookpagination = {notice}, + Maintitle = {Dated greek minuscule manuscripts to the year 1200}, + Publisher = {The American Academy of Arts and Sciences}, + Title = {Manuscripts in Rome, in Messina, in Naples, and in London}, + Volume = {9}, + Year = {1938}} + +@book{Richard192-3, + Crossref = {Richard192}, + Subtitle = {Belles-Lettres, Coislin - Supplément, Paris et départements}, + Title = {Ancien fonds grec}, + Volume = {3}, + Year = {1888}} + +@mvbook{Richard192, + Address = {Paris}, + Author = {Henri Omont}, + Date = {1886/1898}, + Publisher = {Alphonse Picard}, + Volumes = {4}} + +@book{Richard834, + Address = {Vatican}, + Author = {Robertus Devreesse}, + Maintitle = {Bibliothecae Apostolicae Vaticanae codices manu scripti recensiti iussu Pii~XI Pontificis Maximi, Praeside Iohanne Mercati S. Georgii in Velabro Card. Diacono, S. R. E. Bybliothecario (\emph{sic}) et Scriniario}, + Publisher = {Bibliotheca Vaticana}, + Richard = {834}, + Subtitle = {Codices~1485-1683}, + Title = {Codices Vaticani Graeci}, + Year = {1950}} + +@mvbook{Ehrhard, + Address = {Osnabrück}, + Author = {Albert Ehrhard}, + Origdate = {1937/1952}, + Origlocation = {Leipzig}, + Origpublisher = {J. C. Hinrichs Verlag}, + Publisher = {Otto Zeller Verlag}, + Subtitle = {von den Anfängen bis zum Ende des 16. Jahrhunderts}, + Title = {Überlieferung und Bestand der hagiographischen und homiletischen Literatur der griechischen Kirche}, + Volumes = {3}, + Year = {1965}} + +(a)book{Ehrhard1.1, + Crossref = {Ehrhard}, + Origdate = {1937}, + Part = {1}, + Volume = {1}} + +@book{Richard2445, + Address = {Vienne}, + Author = {Herbert Hunger}, + Maintitle = {Katalog der griechischen handschriften des Österreichischen Nationalbibliothek}, + Publisher = {Georg Prachner Verlag}, + Richard = {2445}, + Title = {Codices historici, codices philosophici et philologici}, + Year = {1961}} + +@book{Bodleian_quarto_t1, + Address = {Oxford}, + Author = {Coxe, Henry}, + Bookpagination = {column}, + Maintitle = {Quarto Catalogues}, + Origdate = {1853}, + Publisher = {Bodleian Library}, + Richard = {1843}, + Subtitle = {Reprinted with corrections from the edition of 1853}, + Title = {Greek Manuscripts}, + Volume = {1}, + Year = {1969}} + +(a)book{Richard1842.1, + Address = {Oxford}, + Author = {Henricus Coxe}, + Bookpagination = {column}, + Maintitle = {Catalogi codicum manuscriptorum Bibliothecae Bodleianae}, + Publisher = {Typographeus Academicus}, + Richard = {1841}, + Title = {recensionem codicum graecorum continens}, + Volume = {1}, + Year = {1853}} + +@manuscript{U, + Address = {Vatican}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[334]{Lake1938}[161-164]{Richard857}[421-425]{Richard834}[673-676]{Ehrhard1.1}[80]{Batiffoll1891}}, + Collection = {Grec}, + Columns = {1}, + Dating = {\textsc{x}\textsuperscript{e} c.}, + Library = {Biblioteca Apostolica Vaticana}, + Origin = {Constantinople (Monastère Saint~Jean le Précurseur)}, + Pages = {326\verso-340\verso}, + Pagetotal = {406}, + Scribe = {Dorothee}, + Shelfmark = {1671}, + Support = {Pergament}} + +@manuscript{O, + Address = {Vienna}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[50-54]{Richard2445}[682-688]{Ehrhard1.1}}, + Collection = {Hist. gr.}, + Columns = {2}, + Dating = {\textsc{xi}\textsuperscript{e} c.}, + Library = {Österreichische Nationalbibliothek}, + Origin = {Constantinople ?}, + Pages = {263\recto-273\verso}, + Pagetotal = {310}, + Shelfmark = {45}, + Shortlibrary = {ÖNB}, + Support = {pergament}} + +@manuscript{L, + Address = {Oxford}, + Annotation = {Some comments \par Some comments}, + Catalog = {[543D-546C]{Richard1842.1}{Bodleian_quarto_t1}}, + Collection = {Laudian Collection}, + Columns = {1}, + Dating = {\textsc{xvi}\textsuperscript{e} c.}, + Library = {Bodleian Library}, + Pages = {219-238}, + Pagetotal = {426}, + Shelfmark = {Gr.~64a}, + Support = {paper}} + +@manuscript{S, + Address = {Paris}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[55]{Richard192-3}[678-679]{Ehrhard1.1}}, + Collection = {Supplément grec}, + Columns = {2}, + Date-Modified = {2013-12-24 15:21:30 +0000}, + Dating = {\textsc{x}\textsuperscript{e} c.}, + Library = {Bibliothèque Nationale de France}, + Origin = {Constantinople}, + Pages = {233\verso-245\recto}, + Pagetotal = {282}, + Scribe = {Stephen}, + Shelfmark = {241}, + Shortlibrary = {BNF}, + Support = {Pergament}} Binary files old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf and new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex --- old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,22 @@ +\documentclass{article} +\usepackage{fontspec} +\usepackage{polyglossia} +\setmainlanguage{english} +\setmainfont{Linux Libertine O} +\usepackage[backend=biber,bibstyle=manuscripts,citestyle=verbose]{biblatex} +\addbibresource{biblatex-manuscripts-philology-example.bib} +\begin{document} +\title{biblatex-manuscripts-philology-examples} +\author{Maïeul Rouquette} +\maketitle +\nocite{*} + +\printshorthands[type=manuscript,title=Manuscripts' description,env=details] +\newpage +\printshorthands[type=manuscript,title=Conspectus siglorum] +\newpage +\begin{refcontext}[sorting=manuscripts]{} +\printbibliography[type=manuscript, title=Manuscripts' list] +\end{refcontext} + +\end{document} Binary files old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf and new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex --- old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex 2016-03-12 00:40:26.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex 2017-02-01 00:01:04.000000000 +0100 @@ -1,5 +1,6 @@ \documentclass{ltxdockit}[2011/03/25] \usepackage{btxdockit} +\usepackage{metalogo} \usepackage{fontspec} \usepackage[mono=false]{libertine} \usepackage{microtype} @@ -19,8 +20,8 @@ subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.8.0}, - date={11/03/2016}, + revision={1.12.2}, + date={31/01/2017}, url={https://github.com/maieul/biblatex-manuscripts-philology}} @@ -209,18 +210,39 @@ \label{sorting} If you doesn't use the shorthands' feature, you can want to print a list of manuscripts, sorted by Town, Library, Collection, Shelfmark. -You can use, for that, the option \opt{sorting=manuscripts}. +For this purpose, you can use, the option \opt{sorting=manuscripts} of a \env{refcontext} environment. \begin{minted}{latex} +\begin{refcontext}[sorting=manuscripts]{} \printbibliography[ type=manuscript, title=Description of other manuscripts, - sorting=manuscripts ] +\end{refcontext} \end{minted} You can use the special field \bibfield{sortshelfmark} if the way you shelf marks are sorted is not the way they are printed (like in normal entry type, you can use \bibfield{sorttitle}. +However, using different sorting scheme for different bibliography in the same document implies that biber will insert many time the bibliographic entries in the \verb+.bbl+ file, once by sorting scheme. +If you have a bib bibliography, that could make \LaTeX finishing the next run by a\\ \verb`TeX capacity exceeded, sorry [main memory size=<something>]` +\\ +because this will full the memory\footnote{The problem should not happen if you use \LuaLaTeX, because, contrary to \XeLaTeX\ and \LaTeX, \LuaLaTeX\ has no limit in memory, except the limit of the computer\ldots\ which should be enough with recent computer.}. + +In order to prevent this, the package also provides sorting schemes to get the same sorting scheme for manuscripts and other entries, even if separated in the final bibliography. +The following sorting schemes are adapted for the standard \biblatex\ sorting schemes: +\begin{itemize} + \item \verb`nty+manuscripts`, adapted from \verb+nty+; + \item \verb-nyt+manuscripts-, adapted from \verb-nyt-; + \item \verb-nyvt+manuscripts-, adapted from \verb-nyvt-. +\end{itemize} + +To use these scheme, don't use \env{recontext} environment, but simply the global option when loading \biblatex: +\begin{minted}{tex} +\usepackage[sorting=nty+manuscripts,…]{biblatex} +\end{minted} + +If you need more sorting scheme, please contact us, we could integrate them easily. + \section{Customization} \subsection{Commands} @@ -228,27 +250,31 @@ You can redefine, with \cs{renewcommand} some commands defined in \file{manuscripts.bbx}. The commands starting with \cs{mk...} take one argument, the other take no argument. In these command, use the punctuation commands of \biblatex. \begin{ltxsyntax} -\csitem{collectionshelfmarkpunct} the punct between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}. +\csitem{collectionshelfmarkpunct} the punctuation between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}. + +\csitem{columnslayerpunct} the punctuation between \bibfield{columns} and \bibfield{layer}. By default \cs{addsemicolon}\cs{addspace}. -\csitem{datingpagespunct} the punct between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. +\csitem{datingpagespunct} the punctuation between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. -\csitem{librarycollectionpunct} the punct between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}. +\csitem{librarycollectionpunct} the punctuation between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}. \csitem{mkcolumns} the way the \bibfield{columns} are printed. By default, in parens. -\csitem{mklocation} the way the \bibfield{location} is printed. By default, with the command \cs{mkbibnamelast}. +\csitem{mkcolumnslayer} the way the \bibfield{columns} and \bibfield{layer} fields are printed together. By default, in parens. + +\csitem{mklocation} the way the \bibfield{location} is printed. By default, with the command \cs{mkbibnamefamily}. \csitem{mkmanuscriptdescriptionlabel} the way the label are printed before the special field. By default, in bold, following with \cs{manuscriptdescriptionlabelpunct}. \csitem{mkshcite} the way the shorthand is printed when using \cs{shcite}. By default, no special formatting. -\cs{locationlibrarypunct} the punct between \bibfield{location} and \bibfield{library}. By default \cs{addcolon}\cs{addspace}. +\csitem{locationlibrarypunct} the punctuation between \bibfield{location} and \bibfield{library}. By default \cs{addcolon}\cs{addspace}. -\cs{manuscriptdescriptionlabelpunct} the punct between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}. +\csitem{manuscriptdescriptionlabelpunct} the punctuation between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}. -\cs{moreinterpunct} the punct between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}. +\csitem{moreinterpunct} the punctuation between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}. -\cs{pagetotalpagespunct} the punct between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}. +\csitem{pagetotalpagespunct} the punctuation between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}. \end{ltxsyntax} \subsection{Commands to use in the \bibfield{pages} field} @@ -272,7 +298,29 @@ \begin{changelog} +\begin{release}{1.12.2}{2017-01-31} + \item Fix spurious space after citation of a manuscript. +\end{release} +\begin{release}{1.12.1}{2016-10-28} + \item Move url after folio and columns data. +\end{release} + +\begin{release}{1.12.0}{2016-10-23} + \item New sorting schemes. +\end{release} + +\begin{release}{1.11.0}{2016-09-21} + \item Fix typographical bug when using both \bibfield{layer} and \bibfield{columns} fields without \bibfield{pages} field. +\end{release} + +\begin{release}{1.10.1}{2016-09-07} + \item Use \cs{mkbibnamefamily} instead of \cs{mkbibnamelast} (biblatex 3.3 and later). +\end{release} + +\begin{release}{1.10.0}{2016-06-07} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} \begin{release}{1.8.0}{2016-03-11} \item Fix compatibility with \biblatex~3.3. \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/example.bib new/doc/latex/biblatex-manuscripts-philology/documentation/example.bib --- old/doc/latex/biblatex-manuscripts-philology/documentation/example.bib 2014-04-15 00:51:14.000000000 +0200 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/example.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ -%% This BibTeX bibliography file was created using BibDesk. -%% http://bibdesk.sourceforge.net/ - - -%% Created for Maïeul at 2014-04-07 15:08:51 +0200 - - -%% Saved with string encoding Unicode (UTF-8) - - - -@manuscript{C, - Address = {Cambridge}, - Annote = {Some comments }, - Bookpagination = {folio}, - Collection = {Additional greek manuscript}, - Columns = {1}, - Date-Added = {2014-04-07 12:59:25 +0000}, - Date-Modified = {2014-04-07 13:08:49 +0000}, - Dating = {\textsc{viii}-\textsc{ix}\textsuperscript{e} c.}, - Layer = {inf}, - Library = {University Library}, - Pages = {11\recto-11\verso}, - Pagetotal = {16}, - Shelfmark = {4489}, - Support = {pergament}} - -@book{Batiffoll1891, - Address = {Paris}, - Author = {Pierre Batiffol}, - Publisher = {Alphonse Picard}, - Subtitle = {contribution à l'histoire de la Vaticane}, - Title = {L'abbaye de Rossano}, - Year = {1891}} - -@book{Richard857, - Address = {Bruxelles}, - Author = {Franchi de' Cavalieri, Pio Petro}, - Publisher = {Société des Bollandistes}, - Title = {Catalogus codicum hagiographicorum graecorum Bibliothecae Vaticanae}, - Year = {1899}} - -@book{Lake1938, - Address = {Boston}, - Author = {Kirsopp Lake and Silvia Lake}, - Bookpagination = {notice}, - Maintitle = {Dated greek minuscule manuscripts to the year 1200}, - Publisher = {The American Academy of Arts and Sciences}, - Title = {Manuscripts in Rome, in Messina, in Naples, and in London}, - Volume = {9}, - Year = {1938}} - -@book{Richard192-3, - Crossref = {Richard192}, - Subtitle = {Belles-Lettres, Coislin - Supplément, Paris et départements}, - Title = {Ancien fonds grec}, - Volume = {3}, - Year = {1888}} - -@mvbook{Richard192, - Address = {Paris}, - Author = {Henri Omont}, - Date = {1886/1898}, - Publisher = {Alphonse Picard}, - Volumes = {4}} - -@book{Richard834, - Address = {Vatican}, - Author = {Robertus Devreesse}, - Maintitle = {Bibliothecae Apostolicae Vaticanae codices manu scripti recensiti iussu Pii~XI Pontificis Maximi, Praeside Iohanne Mercati S. Georgii in Velabro Card. Diacono, S. R. E. Bybliothecario (\emph{sic}) et Scriniario}, - Publisher = {Bibliotheca Vaticana}, - Richard = {834}, - Subtitle = {Codices~1485-1683}, - Title = {Codices Vaticani Graeci}, - Year = {1950}} - -@mvbook{Ehrhard, - Address = {Osnabrück}, - Author = {Albert Ehrhard}, - Origdate = {1937/1952}, - Origlocation = {Leipzig}, - Origpublisher = {J. C. Hinrichs Verlag}, - Publisher = {Otto Zeller Verlag}, - Subtitle = {von den Anfängen bis zum Ende des 16. Jahrhunderts}, - Title = {Überlieferung und Bestand der hagiographischen und homiletischen Literatur der griechischen Kirche}, - Volumes = {3}, - Year = {1965}} - -(a)book{Ehrhard1.1, - Crossref = {Ehrhard}, - Origdate = {1937}, - Part = {1}, - Volume = {1}} - -@book{Richard2445, - Address = {Vienne}, - Author = {Herbert Hunger}, - Maintitle = {Katalog der griechischen handschriften des Österreichischen Nationalbibliothek}, - Publisher = {Georg Prachner Verlag}, - Richard = {2445}, - Title = {Codices historici, codices philosophici et philologici}, - Year = {1961}} - -@book{Bodleian_quarto_t1, - Address = {Oxford}, - Author = {Coxe, Henry}, - Bookpagination = {column}, - Maintitle = {Quarto Catalogues}, - Origdate = {1853}, - Publisher = {Bodleian Library}, - Richard = {1843}, - Subtitle = {Reprinted with corrections from the edition of 1853}, - Title = {Greek Manuscripts}, - Volume = {1}, - Year = {1969}} - -(a)book{Richard1842.1, - Address = {Oxford}, - Author = {Henricus Coxe}, - Bookpagination = {column}, - Maintitle = {Catalogi codicum manuscriptorum Bibliothecae Bodleianae}, - Publisher = {Typographeus Academicus}, - Richard = {1841}, - Title = {recensionem codicum graecorum continens}, - Volume = {1}, - Year = {1853}} - -@manuscript{U, - Address = {Vatican}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[334]{Lake1938}[161-164]{Richard857}[421-425]{Richard834}[673-676]{Ehrhard1.1}[80]{Batiffoll1891}}, - Collection = {Grec}, - Columns = {1}, - Dating = {\textsc{x}\textsuperscript{e} c.}, - Library = {Biblioteca Apostolica Vaticana}, - Origin = {Constantinople (Monastère Saint~Jean le Précurseur)}, - Pages = {326\verso-340\verso}, - Pagetotal = {406}, - Scribe = {Dorothee}, - Shelfmark = {1671}, - Support = {Pergament}} - -@manuscript{O, - Address = {Vienna}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[50-54]{Richard2445}[682-688]{Ehrhard1.1}}, - Collection = {Hist. gr.}, - Columns = {2}, - Dating = {\textsc{xi}\textsuperscript{e} c.}, - Library = {Österreichische Nationalbibliothek}, - Origin = {Constantinople ?}, - Pages = {263\recto-273\verso}, - Pagetotal = {310}, - Shelfmark = {45}, - Shortlibrary = {ÖNB}, - Support = {pergament}} - -@manuscript{L, - Address = {Oxford}, - Annotation = {Some comments \par Some comments}, - Catalog = {[543D-546C]{Richard1842.1}{Bodleian_quarto_t1}}, - Collection = {Laudian Collection}, - Columns = {1}, - Dating = {\textsc{xvi}\textsuperscript{e} c.}, - Library = {Bodleian Library}, - Pages = {219-238}, - Pagetotal = {426}, - Shelfmark = {Gr.~64a}, - Support = {paper}} - -@manuscript{S, - Address = {Paris}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[55]{Richard192-3}[678-679]{Ehrhard1.1}}, - Collection = {Supplément grec}, - Columns = {2}, - Date-Modified = {2013-12-24 15:21:30 +0000}, - Dating = {\textsc{x}\textsuperscript{e} c.}, - Library = {Bibliothèque Nationale de France}, - Origin = {Constantinople}, - Pages = {233\verso-245\recto}, - Pagetotal = {282}, - Scribe = {Stephen}, - Shelfmark = {241}, - Shortlibrary = {BNF}, - Support = {Pergament}} Binary files old/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf and new/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/example.tex new/doc/latex/biblatex-manuscripts-philology/documentation/example.tex --- old/doc/latex/biblatex-manuscripts-philology/documentation/example.tex 2014-03-20 23:50:39.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/example.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -\documentclass{article} -\usepackage{fontspec} -\usepackage{polyglossia} -\setmainlanguage{english} -\setmainfont{Linux Libertine O} -\usepackage[backend=biber,bibstyle=manuscripts,citestyle=verbose]{biblatex} -\addbibresource{example.bib} -\begin{document} -\title{Examples} -\author{Maïeul Rouquette} -\maketitle -\nocite{*} - -\printshorthands[type=manuscript,title=Manuscripts' description,env=details] -\newpage -\printshorthands[type=manuscript,title=Conspectus siglorum] - - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/makefile new/doc/latex/biblatex-manuscripts-philology/documentation/makefile --- old/doc/latex/biblatex-manuscripts-philology/documentation/makefile 2014-01-23 00:10:03.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/documentation/makefile 2016-11-25 19:28:15.000000000 +0100 @@ -1,9 +1,9 @@ all: *tex *bib xelatex --shell-escape biblatex-manuscripts-philology.tex xelatex --shell-escape biblatex-manuscripts-philology.tex - xelatex --shell-escape example.tex - biber example - xelatex --shell-escape example.tex + xelatex --shell-escape biblatex-manuscripts-philology-example.tex + biber biblatex-manuscripts-philology-example + xelatex --shell-escape biblatex-manuscripts-philology-example.tex clean: $(MAKE) -C documentation clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/makefile new/doc/latex/biblatex-manuscripts-philology/makefile --- old/doc/latex/biblatex-manuscripts-philology/makefile 2016-03-12 00:40:26.000000000 +0100 +++ new/doc/latex/biblatex-manuscripts-philology/makefile 2016-11-25 19:28:15.000000000 +0100 @@ -15,5 +15,5 @@ $(MAKE) -C documentation clean @$(RM) *.pdf *.toc *.aux *.out *.fdb_latexmk *.log *.bbl *.bcf *.blg *run.xml *.synctex.gz* -all: documentation/example.tex documentation/biblatex-manuscripts-philology.tex documentation/example.bib +all: documentation/biblatex-manuscripts-philology-example.tex documentation/biblatex-manuscripts-philology.tex documentation/biblatex-manuscripts-philology-example.bib $(MAKE) -C documentation all \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj new/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj 2016-04-14 18:42:21.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj 2017-04-14 17:31:53.000000000 +0200 @@ -1,14 +1,14 @@ name biblatex-manuscripts-philology.doc category Package -revision 40004 +revision 43108 shortdesc doc files of biblatex-manuscripts-philology relocated 1 -docfiles size=37 +docfiles size=40 RELOC/doc/latex/biblatex-manuscripts-philology/README + RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib + RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf + RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex - RELOC/doc/latex/biblatex-manuscripts-philology/documentation/example.bib - RELOC/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf - RELOC/doc/latex/biblatex-manuscripts-philology/documentation/example.tex RELOC/doc/latex/biblatex-manuscripts-philology/documentation/makefile RELOC/doc/latex/biblatex-manuscripts-philology/makefile ++++++ biblatex-manuscripts-philology.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx --- old/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx 2016-02-12 01:25:03.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx 2017-02-01 00:01:06.000000000 +0100 @@ -12,7 +12,7 @@ % % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx -\ProvidesFile{english-manuscripts.lbx}[2016/02/11 v1.7.0 manuscripts biblatex localisation] +\ProvidesFile{english-manuscripts.lbx}[2017/01/31 v1.12.2 manuscripts biblatex localisation]% \InheritBibliographyStrings{english} \InheritBibliographyExtras{english} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx --- old/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx 2016-02-12 01:25:03.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx 2017-02-01 00:01:06.000000000 +0100 @@ -12,7 +12,7 @@ % % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx -\ProvidesFile{french-manuscripts.lbx}[2016/02/11 v1.7.0 manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2017/01/31 v1.12.2 manuscripts biblatex localisation]% \InheritBibliographyStrings{french} \InheritBibliographyExtras{french} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx --- old/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx 2016-02-12 01:25:03.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx 2017-02-01 00:01:06.000000000 +0100 @@ -12,7 +12,7 @@ % % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx -\ProvidesFile{italian-manuscripts.lbx}[2016/02/10 v1.7.0 manuscripts biblatex localisation] +\ProvidesFile{italian-manuscripts.lbx}[2017/01/31 v1.12.2 manuscripts biblatex localisation]% \InheritBibliographyStrings{italian} \InheritBibliographyExtras{italian} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx 2017-02-01 00:01:06.000000000 +0100 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx \ProvidesFile{manuscripts-noautoshorthand.bbx} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +[2017/01/31 v1.12.2 biblatex bibliography style (MR)]% \RequireBibliographyStyle{manuscripts-shared} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx 2017-02-01 00:01:06.000000000 +0100 @@ -13,5 +13,5 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx \ProvidesFile{manuscripts-noautoshorthand.dbx} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +[2017/01/31 v1.12.2 biblatex bibliography style (MR)] \blx(a)inputonce{manuscripts-shared.dbx}{}{}{}{}{} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx 2017-02-01 00:01:06.000000000 +0100 @@ -14,7 +14,7 @@ % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx \ProvidesFile{manuscripts-commons} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +[2017/01/31 v1.12.2 biblatex bibliography style (MR)]% \ifdef{\biblatexmultipledm@bibstyle} {\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}} @@ -34,7 +34,8 @@ \newcommand{\mkcolumns}[1]{\addspace\mkbibparens{#1}} \newcommand{\mklayer}[1]{\addspace\mkbibparens{#1}} -\newcommand{\mklocation}[1]{\mkbibnamelast{#1}} +\newcommand{\mkcolumnslayer}[1]{\addspace\mkbibparens{#1}}% +\newcommand{\mklocation}[1]{\mkbibnamefamily{#1}} \newcommand{\mkmanuscriptdescriptionlabel}[1]{\textbf{#1}\manuscriptdescriptionlabelpunct} \newcommand{\mkshcite}[1]{#1} @@ -42,6 +43,7 @@ \newcommand{\manuscriptdescriptionlabelpunct}{\addcolon\addspace} \newcommand{\moreinterpunct}{\addsemicolon\addspace} \newcommand{\pagetotalpagespunct}{\addcolon\addspace} +\newcommand{\columnslayerpunct}{\addsemicolon\addspace}% \def\recto{r} @@ -102,12 +104,40 @@ \newbibmacro{manuscript:pages}{% \printfield{pagetotal}% - \iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}% - \setunit{\pagetotalpagespunct}% - \printfield{pages}% - \iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}% + \iffieldundef{pages}% + {% + \usebibmacro{manuscript:columns+layer}% + }% + {% + \usebibmacro{manuscript:columns}% + \setunit{\pagetotalpagespunct}% + \printfield{pages}% + \usebibmacro{manuscript:layer}% + }% } +\newbibmacro{manuscript:columns+layer}{% + \ifboolexpr{test {\iffieldundef{columns}} or test{\iffieldundef{layer}}}{% + \usebibmacro{manuscript:columns}% + \usebibmacro{manuscript:layer}% + }% + {% + \printtext[columns+layer]{% + \bibstring{\strfield{columns}column}% + \setunit{\columnslayerpunct}% + \bibstring{\strfield{layer}layer}% + }% + }% +}% + +\newbibmacro{manuscript:columns}{% + \iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}% +}% + +\newbibmacro{manuscript:layer}{% + \iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}% +}% + \newbibmacro{support+dating}{% \printfield{support}% \newunit% @@ -122,9 +152,10 @@ \DeclareFieldFormat{collection+shelfmark}{% \printtext[title]{#1}% } -\DeclareFieldFormat{dating}{#1\isdot} +\DeclareFieldFormat{columns+layer}{\mkcolumnslayer{#1}}% +\DeclareFieldFormat{dating}{#1\isdot}% -\DeclareFieldFormat{support}{\bibstring{#1}} +\DeclareFieldFormat{support}{\bibstring{#1}}% \DeclareNameFormat{manuscript}{% \nameparts{#1}% @@ -173,45 +204,45 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{location+library+collection+shelfmark}% - \newunit + \newunit% \printlist{language}% - \newunit\newblock + \newunit\newblock% \printfield{howpublished}% \newunit\newblock \printfield{note}% - \newunit\newblock - \usebibmacro{support+dating} - \newunit\newblock - \iftoggle{bbx:url} - {\usebibmacro{url+urldate}} - {}% - \setunit{\datingpagespunct} - \usebibmacro{manuscript:pages} - \iftoggle{bbx:related} + \newunit\newblock% + \usebibmacro{support+dating}% + \setunit{\datingpagespunct}% + \usebibmacro{manuscript:pages}% + \iftoggle{bbx:related}% {\newunit\newblock% \usebibmacro{related:init}% \usebibmacro{related}} {}% + \newunit\newblock% + \iftoggle{bbx:url}% + {\usebibmacro{url+urldate}}% + {}% \usebibmacro{more+annotation+catalog}% - \usebibmacro{finentry} + \usebibmacro{finentry}% } \DeclareBibliographyDriver{cite:manuscript}{%For biblatex-chicago styles \usebibmacro{bibindex}% \usebibmacro{location+library+collection+shelfmark}% - \newunit + \newunit% \printlist{language}% - \newunit\newblock + \newunit\newblock% \printfield{howpublished}% - \newunit\newblock + \newunit\newblock% \printfield{note}% - \newunit\newblock - \usebibmacro{support+dating} - \newunit\newblock - \setunit{\datingpagespunct} - \usebibmacro{manuscript:pages} + \newunit\newblock% + \usebibmacro{support+dating}% + \newunit\newblock% + \setunit{\datingpagespunct}% + \usebibmacro{manuscript:pages}% \usebibmacro{more+annotation+catalog}% - \usebibmacro{finentry} + \usebibmacro{finentry}% } %% 5.2 Citation command @@ -240,16 +271,11 @@ %% 5.6 Sorting -\DeclareSortingScheme{manuscripts}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } + +\def\bbx@manuscripts@sorting{ \sort{ \field{location} - \literal{0000} + \literal{0000} } \sort{ \field{library} @@ -265,13 +291,125 @@ } } -% 6. Prevent trouble with abbreviated forme (verbose family) +\DeclareSortingScheme{manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@manuscripts@sorting +} + +% Adaptation from biblatex.def + +\DeclareSortingScheme{nty+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{volume} + \literal{0} + } + \bbx@manuscripts@sorting +} + +\DeclareSortingScheme{nyt+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{volume} + \literal{0} + } + \bbx@manuscripts@sorting +} + +\DeclareSortingScheme{nyvt+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field{volume} + \literal{0} + } + \sort{ + \field{sorttitle} + \field{title} + } + \bbx@manuscripts@sorting +} + + + +% 6. Prevent trouble with abbreviated form (verbose family) + +\newcommand{\biblatexms@patchfail}[1]{\PackageError{biblatex-manuscripts-philology}{Fail to patch #1}{}} \RequirePackage{xpatch} \newbibmacro{manuscript:add:shortened}{\ifentrytype{manuscript}{\usebibmacro{location+library+collection+shelfmark}}{}} \newcommand{\manuscriptaddshortened}[1]{% \def\do##1{% - \xpretobibmacro{##1}{\usebibmacro{manuscript:add:shortened}}{}{}% + \xpretobibmacro{##1}% + {\usebibmacro{manuscript:add:shortened}}% + {}% + {\ifcsvoid{abx@macro@##1}% + {}% + {\biblatexms@patchfail{##1}}% + }% }% \docsvlist{#1}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx 2017-02-01 00:01:06.000000000 +0100 @@ -12,8 +12,8 @@ % % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx -\ProvidesFile{manuscripts-shared.dbx} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +\ProvidesFile{manuscripts-shared.dbx}% +[2017/01/31 v1.12.2 biblatex bibliography style (MR)]% \DeclareDatamodelEntrytypes{manuscript} \DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,sortshelfmark,support,columns,layer} \DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx 2017-02-01 00:01:06.000000000 +0100 @@ -12,8 +12,8 @@ % % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx -\ProvidesFile{manuscripts.bbx} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +\ProvidesFile{manuscripts.bbx}% +[2017/01/31 v1.12.2 biblatex bibliography style (MR)]% \RequireBibliographyStyle{manuscripts-shared} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx --- old/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx 2016-03-12 00:40:26.000000000 +0100 +++ new/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx 2017-02-01 00:01:06.000000000 +0100 @@ -13,5 +13,5 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx \ProvidesFile{manuscripts.dbx} -[2016/03/11 v1.8.0 biblatex bibliography style (MR)] +[2017/01/31 v1.12.2 biblatex bibliography style (MR)] \blx(a)inputonce{manuscripts-shared.dbx}{}{}{}{}{} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj new/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj --- old/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj 2016-04-14 18:42:21.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj 2017-04-14 17:31:53.000000000 +0200 @@ -1,12 +1,12 @@ name biblatex-manuscripts-philology category Package -revision 40004 +revision 43108 shortdesc Manage classical manuscripts with BibLaTeX relocated 1 longdesc The package adds a new entry type: @manuscript to manage longdesc manuscript in classical philology, for example to prepare a longdesc critical edition. -runfiles size=10 +runfiles size=11 RELOC/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx RELOC/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx RELOC/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx @@ -17,7 +17,7 @@ RELOC/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx RELOC/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-manuscripts-philology -catalogue-date 2016-03-11 14:51:05 +0100 +catalogue-date 2017-01-31 19:06:35 +0100 catalogue-license lppl1.3 catalogue-topics biblatex humanities -catalogue-version 1.9.0 +catalogue-version 1.12.2 ++++++ biblatex-mla.doc.tar.xz ++++++ ++++ 3567 lines of diff (skipped) ++++++ biblatex-mla.tar.xz ++++++ ++++ 2792 lines of diff (skipped) ++++++ biblatex-morenames.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf and new/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex new/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex --- old/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex 2017-01-26 00:01:03.000000000 +0100 @@ -18,14 +18,15 @@ \usepackage[citestyle=verbose,bibstyle=morenames]{biblatex} \bibliography{example-maineditor.bib} \bibliography{example-bookineditor.bib} +\bibliography{example-bookineditor-BookineditorFromEditor.bib} % Meta-datas \titlepage{% title={Biblatex-morenames}, subtitle={New fields of name type for standard biblatex entry types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.0.0}, - date={06/04/2016}, + revision={1.3.1}, + date={25/01/2017}, url={https://git.framasoft.org/maieul/biblatex-morenames}} @@ -167,17 +168,30 @@ \subsection{\bibfield{ineditor} and \bibfield{bookineditor}} \subsubsection{Meaning} -For a \bibtype{article}, a \bibtype{inbook} entry, \bibfield{ineditor} means the editor of the single contribution, while \bibfield{editor} means the editor of the global volume. +For a \bibtype{article} or a \bibtype{inbook} entry, \bibfield{ineditor} means the editor of the single contribution, while \bibfield{editor} means the editor of the global volume. For a \bibtype{bookinbook}, \bibfield{bookineditor} means the editor of the (ancient) edited book, while \bibfield{editor} means the editor of the global volume. +The \bibtype{ineditor} or the \bibfield{bookineditor} field is typeset immediately after the title of the subentry, while the \bibtype{editor} field is typeset after the title of the main entry. -\subsubsection{.bib example} + + + +Notes that if the value of \bibtype{bookineditor} or \bibfield{ineditor} field is equal to the \bibfield{editor} field, this last one is not printed. + +There is two modes of inheritance for these fields: the default one and the optional one. + +\subsubsection{Default inheritance mode} + +With the default inheritance mode, the \bibtype{bookineditor} field of the subentry is never inherited from the main entry. + + +\paragraph{.bib example} \inputminted[breaklines]{latex}{example-bookineditor.bib} -\subsubsection{Fields inheritance} +\paragraph{Fields inheritance} The graph~\ref{example-bookineditor} shows the fields inheritance. @@ -185,16 +199,87 @@ \centering \includegraphics[height=0.99\textheight]{example-bookineditor.pdf} \label{example-bookineditor} - \caption{Inheritance related to the \bibtype{bookineditor} field} + \caption{Inheritance related to the \bibtype{bookineditor} field, default setting} \end{figure} -\subsubsection{Output example} + + +\paragraph{Output example} \begin{quotation} \cite{BHG226} + + \cite{BHG225} +\end{quotation} +\subsubsection{Optional inheritance} + +With the optional inheritance, the \bibfield{bookineditor} or \bibfield{ineditor} field of the subentry is inherited from the \bibfield{editor} field of the main entry, except if the subentrty has already a \bibfield{bookineditor} or \bibfield{ineditor} field. + + +To enable this feature for the \bibfield{bookineditor} field, just add in your preamble, after loading biblatex, the following line: +\begin{minted}{latex} +\toggletrue{BookineditorFromEditor} +\end{minted} + +To enable this feature for the \bibfield{ineditor} field, just add in your preamble, after loading biblatex, the following line: +\begin{minted}{latex} +\toggletrue{IneditorFromEditor} +\end{minted} + +You can disable these features for specific subentry using \verb+noinherit=bookineditor+ or \verb`noinherit=ineditor` in the \bibfield{options} field of this subentry. + +\paragraph{.bib example} + +\inputminted[breaklines]{latex}{example-bookineditor-BookineditorFromEditor.bib} + +\paragraph{Fields inheritance} + +The graph~\ref{example-bookineditor-BookineditorFromEditor} shows the fields inheritance. + +\begin{figure} + \centering + \includegraphics[height=0.99\textheight]{example-bookineditor-BookineditorFromEditor.pdf} + \label{example-bookineditor-BookineditorFromEditor} + \caption{Inheritance related to the \bibtype{bookineditor} field with optional inheritance} +\end{figure} + + +\paragraph{Output example} + +\begin{quotation} + \cite{BHG226a} + + \cite{BHG225a} \end{quotation} \section{Change history} \begin{changelog} + +\begin{release}{1.3.1}{2017-01-25} + \item Fix spurious space when a book have nore author, nore editor. +\end{release} + +\begin{release}{1.3.0a}{2016-11-26} + \item Fix typo in handbook. +\end{release} + +\begin{release}{1.3.0}{2016-11-23} + \item Add \verb+noinherit=bookineditor+ and \verb+noinherit=ineditor+ options for individual volume. +\end{release} + +\begin{release}{1.2.0}{2016-09-08} + \item If the \bibfield{bookineditor} or \bibfield{ineditor} field is equal to the\bibfield{editor} field, the last one is not printed. + \item Add two options to make \bibfield{bookineditor} or \bibfield{ineditor} to be inherited from \bibfield{editor} field. +\end{release} + +\begin{release}{1.1.1}{2016-09-07} + \item Don't define again \verb+bybookineditor+ macro if already defined by \emph{biblatex-bookinother}. +\end{release} + + +\begin{release}{1.1.0}{2016-06-07} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + \begin{release}{1.0.0}{2016-04-06} \item First public release. \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib new/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib --- old/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,25 @@ +@bookinbook{BHG226a, + Author = {{Alexandre de Chypre}}, + Crossref = {CCSG26a}, + Bookineditor = {Van Deun, Peter}, + Pages = {83-122}, + Title = {Laudatio Barnabae} +} +@book{CCSG26a, + Editor = {Peter Van Deun and Jacques Noret}, + Number = {26}, + Series = {Corpus Christianorum Series Graeca}, + Title = {Hagiographica Cypria}} + +@bookinbook{BHG225a, + Crossref = {AAA2.2a}, + Pages = {292-302}, + Title = {Acta Barnabae} +} +(a)book{AAA2.2a, + Editor = {Maximilien Bonnet}, + Date = {1903}, + Location = {Leipzig}, + Publisher = {Hermann Mendelssohn}, + Title = {Acta Apostolorum Apocrypha}, + Volume = {2.2}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot new/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot --- old/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot 2016-11-25 19:28:15.000000000 +0100 @@ -0,0 +1,86 @@ +digraph Biberdata { + compound = true; + edge [ arrowhead=open ]; + graph [ style=filled, rankdir=LR ]; + node [ + fontsize=10, + fillcolor=white, + style=filled, + shape=box ]; + + subgraph "cluster_section0/AAA2.2a" { + fontsize="10"; + label="AAA2.2a (BOOK)"; + tooltip="AAA2.2a (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/AAA2.2a/editor" [ label="EDITOR" ] + "section0/AAA2.2a/location" [ label="LOCATION" ] + "section0/AAA2.2a/publisher" [ label="PUBLISHER" ] + "section0/AAA2.2a/title" [ label="TITLE" ] + "section0/AAA2.2a/volume" [ label="VOLUME" ] + "section0/AAA2.2a/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG225a" { + fontsize="10"; + label="BHG225a (BOOKINBOOK)"; + tooltip="BHG225a (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG225a/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG225a/booktitle" [ label="BOOKTITLE" ] + "section0/BHG225a/crossref" [ label="CROSSREF" ] + "section0/BHG225a/editor" [ label="EDITOR" ] + "section0/BHG225a/location" [ label="LOCATION" ] + "section0/BHG225a/pages" [ label="PAGES" ] + "section0/BHG225a/publisher" [ label="PUBLISHER" ] + "section0/BHG225a/title" [ label="TITLE" ] + "section0/BHG225a/volume" [ label="VOLUME" ] + "section0/BHG225a/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG226a" { + fontsize="10"; + label="BHG226a (BOOKINBOOK)"; + tooltip="BHG226a (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG226a/author" [ label="AUTHOR" ] + "section0/BHG226a/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG226a/booktitle" [ label="BOOKTITLE" ] + "section0/BHG226a/crossref" [ label="CROSSREF" ] + "section0/BHG226a/editor" [ label="EDITOR" ] + "section0/BHG226a/number" [ label="NUMBER" ] + "section0/BHG226a/pages" [ label="PAGES" ] + "section0/BHG226a/series" [ label="SERIES" ] + "section0/BHG226a/title" [ label="TITLE" ] + } + + subgraph "cluster_section0/CCSG26a" { + fontsize="10"; + label="CCSG26a (BOOK)"; + tooltip="CCSG26a (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/CCSG26a/editor" [ label="EDITOR" ] + "section0/CCSG26a/number" [ label="NUMBER" ] + "section0/CCSG26a/series" [ label="SERIES" ] + "section0/CCSG26a/title" [ label="TITLE" ] + } + + + + "section0/AAA2.2a/editor" -> "section0/BHG225a/bookineditor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/BOOKINEDITOR inherited via CROSSREF from AAA2.2a/EDITOR" ] + "section0/AAA2.2a/editor" -> "section0/BHG225a/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/EDITOR inherited via CROSSREF from AAA2.2a/EDITOR" ] + "section0/AAA2.2a/location" -> "section0/BHG225a/location" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/LOCATION inherited via CROSSREF from AAA2.2a/LOCATION" ] + "section0/AAA2.2a/publisher" -> "section0/BHG225a/publisher" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/PUBLISHER inherited via CROSSREF from AAA2.2a/PUBLISHER" ] + "section0/AAA2.2a/title" -> "section0/BHG225a/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/BOOKTITLE inherited via CROSSREF from AAA2.2a/TITLE" ] + "section0/AAA2.2a/volume" -> "section0/BHG225a/volume" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/VOLUME inherited via CROSSREF from AAA2.2a/VOLUME" ] + "section0/AAA2.2a/year" -> "section0/BHG225a/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG225a/YEAR inherited via CROSSREF from AAA2.2a/YEAR" ] + "section0/CCSG26a/editor" -> "section0/BHG226a/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/EDITOR inherited via CROSSREF from CCSG26a/EDITOR" ] + "section0/CCSG26a/number" -> "section0/BHG226a/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/NUMBER inherited via CROSSREF from CCSG26a/NUMBER" ] + "section0/CCSG26a/series" -> "section0/BHG226a/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/SERIES inherited via CROSSREF from CCSG26a/SERIES" ] + "section0/CCSG26a/title" -> "section0/BHG226a/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226a/BOOKTITLE inherited via CROSSREF from CCSG26a/TITLE" ] + +} Binary files old/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf and new/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib new/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib --- old/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib 2016-11-25 19:28:15.000000000 +0100 @@ -10,3 +10,17 @@ Number = {26}, Series = {Corpus Christianorum Series Graeca}, Title = {Hagiographica Cypria}} + +@bookinbook{BHG225, + Bookineditor = {Maximilien Bonnet}, + Crossref = {AAA2.2}, + Pages = {292-302}, + Title = {Acta Barnabae} +} +(a)book{AAA2.2, + Editor = {Maximilien Bonnet}, + Date = {1903}, + Location = {Leipzig}, + Publisher = {Hermann Mendelssohn}, + Title = {Acta Apostolorum Apocrypha}, + Volume = {2.2}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot new/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot --- old/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot 2016-11-25 19:28:15.000000000 +0100 @@ -8,6 +8,38 @@ style=filled, shape=box ]; + subgraph "cluster_section0/AAA2.2" { + fontsize="10"; + label="AAA2.2 (BOOK)"; + tooltip="AAA2.2 (BOOK)"; + fillcolor="#a0d0ff"; + + "section0/AAA2.2/editor" [ label="EDITOR" ] + "section0/AAA2.2/location" [ label="LOCATION" ] + "section0/AAA2.2/publisher" [ label="PUBLISHER" ] + "section0/AAA2.2/title" [ label="TITLE" ] + "section0/AAA2.2/volume" [ label="VOLUME" ] + "section0/AAA2.2/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/BHG225" { + fontsize="10"; + label="BHG225 (BOOKINBOOK)"; + tooltip="BHG225 (BOOKINBOOK)"; + fillcolor="#a0d0ff"; + + "section0/BHG225/bookineditor" [ label="BOOKINEDITOR" ] + "section0/BHG225/booktitle" [ label="BOOKTITLE" ] + "section0/BHG225/crossref" [ label="CROSSREF" ] + "section0/BHG225/editor" [ label="EDITOR" ] + "section0/BHG225/location" [ label="LOCATION" ] + "section0/BHG225/pages" [ label="PAGES" ] + "section0/BHG225/publisher" [ label="PUBLISHER" ] + "section0/BHG225/title" [ label="TITLE" ] + "section0/BHG225/volume" [ label="VOLUME" ] + "section0/BHG225/year" [ label="YEAR" ] + } + subgraph "cluster_section0/BHG226" { fontsize="10"; label="BHG226 (BOOKINBOOK)"; @@ -39,9 +71,15 @@ - "section0/CCSG26/title" -> "section0/BHG226/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/BOOKTITLE inherited via CROSSREF from CCSG26/TITLE" ] - "section0/CCSG26/series" -> "section0/BHG226/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/SERIES inherited via CROSSREF from CCSG26/SERIES" ] - "section0/CCSG26/number" -> "section0/BHG226/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/NUMBER inherited via CROSSREF from CCSG26/NUMBER" ] + "section0/AAA2.2/editor" -> "section0/BHG225/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/EDITOR inherited via CROSSREF from AAA2.2/EDITOR" ] + "section0/AAA2.2/location" -> "section0/BHG225/location" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/LOCATION inherited via CROSSREF from AAA2.2/LOCATION" ] + "section0/AAA2.2/publisher" -> "section0/BHG225/publisher" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/PUBLISHER inherited via CROSSREF from AAA2.2/PUBLISHER" ] + "section0/AAA2.2/title" -> "section0/BHG225/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/BOOKTITLE inherited via CROSSREF from AAA2.2/TITLE" ] + "section0/AAA2.2/volume" -> "section0/BHG225/volume" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/VOLUME inherited via CROSSREF from AAA2.2/VOLUME" ] + "section0/AAA2.2/year" -> "section0/BHG225/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG225/YEAR inherited via CROSSREF from AAA2.2/YEAR" ] "section0/CCSG26/editor" -> "section0/BHG226/editor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/EDITOR inherited via CROSSREF from CCSG26/EDITOR" ] + "section0/CCSG26/number" -> "section0/BHG226/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/NUMBER inherited via CROSSREF from CCSG26/NUMBER" ] + "section0/CCSG26/series" -> "section0/BHG226/series" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/SERIES inherited via CROSSREF from CCSG26/SERIES" ] + "section0/CCSG26/title" -> "section0/BHG226/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226/BOOKTITLE inherited via CROSSREF from CCSG26/TITLE" ] } Binary files old/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf and new/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-maineditor.bib new/doc/latex/biblatex-morenames/documentation/example-maineditor.bib --- old/doc/latex/biblatex-morenames/documentation/example-maineditor.bib 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/example-maineditor.bib 2017-01-26 00:01:03.000000000 +0100 @@ -1,20 +1,20 @@ @mvcollection{HistoireduChristianisme, Address = {Paris}, + Date = {1992/2001}, Editor = {Pietri, Charles and Pietri, Luce and Vauchez, André and Venard, Marc and Mayeur Jean-Marie}, Publisher = {Desclée}, Subtitle = {des origines à nos jours}, Title = {Histoire du christianisme}, - Year = {1992/2001}, Volumes = {20}} @collection{Pietri1998, Crossref = {HistoireduChristianisme}, + Date = {1998}, Date-Added = {2014-11-05 12:44:24 +0000}, Date-Modified = {2014-11-13 20:10:06 +0000}, Editor = {Luce Pietri}, Title = {Les Églises d'Orient et d'Occident}, - Volume = {3}, - Year = {1998}} + Volume = {3}} @incollection{Maraval1998, Author = {Pierre Maraval}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/example-maineditor.dot new/doc/latex/biblatex-morenames/documentation/example-maineditor.dot --- old/doc/latex/biblatex-morenames/documentation/example-maineditor.dot 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/example-maineditor.dot 2017-01-26 00:01:03.000000000 +0100 @@ -8,6 +8,22 @@ style=filled, shape=box ]; + subgraph "cluster_section0/HistoireduChristianisme" { + fontsize="10"; + label="HistoireduChristianisme (MVCOLLECTION)"; + tooltip="HistoireduChristianisme (MVCOLLECTION)"; + fillcolor="#a0d0ff"; + + "section0/HistoireduChristianisme/editor" [ label="EDITOR" ] + "section0/HistoireduChristianisme/endyear" [ label="ENDYEAR" ] + "section0/HistoireduChristianisme/location" [ label="LOCATION" ] + "section0/HistoireduChristianisme/publisher" [ label="PUBLISHER" ] + "section0/HistoireduChristianisme/subtitle" [ label="SUBTITLE" ] + "section0/HistoireduChristianisme/title" [ label="TITLE" ] + "section0/HistoireduChristianisme/volumes" [ label="VOLUMES" ] + "section0/HistoireduChristianisme/year" [ label="YEAR" ] + } + subgraph "cluster_section0/Maraval1998" { fontsize="10"; label="Maraval1998 (INCOLLECTION)"; @@ -49,38 +65,23 @@ "section0/Pietri1998/year" [ label="YEAR" ] } - subgraph "cluster_section0/HistoireduChristianisme" { - fontsize="10"; - label="HistoireduChristianisme (MVCOLLECTION)"; - tooltip="HistoireduChristianisme (MVCOLLECTION)"; - fillcolor="#a0d0ff"; - - "section0/HistoireduChristianisme/editor" [ label="EDITOR" ] - "section0/HistoireduChristianisme/location" [ label="LOCATION" ] - "section0/HistoireduChristianisme/publisher" [ label="PUBLISHER" ] - "section0/HistoireduChristianisme/subtitle" [ label="SUBTITLE" ] - "section0/HistoireduChristianisme/title" [ label="TITLE" ] - "section0/HistoireduChristianisme/volumes" [ label="VOLUMES" ] - "section0/HistoireduChristianisme/year" [ label="YEAR" ] - } - + "section0/HistoireduChristianisme/editor" -> "section0/Pietri1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINEDITOR inherited via CROSSREF from HistoireduChristianisme/EDITOR" ] + "section0/HistoireduChristianisme/location" -> "section0/Pietri1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/LOCATION inherited via CROSSREF from HistoireduChristianisme/LOCATION" ] + "section0/HistoireduChristianisme/publisher" -> "section0/Pietri1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/PUBLISHER inherited via CROSSREF from HistoireduChristianisme/PUBLISHER" ] + "section0/HistoireduChristianisme/subtitle" -> "section0/Pietri1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINSUBTITLE inherited via CROSSREF from HistoireduChristianisme/SUBTITLE" ] + "section0/HistoireduChristianisme/title" -> "section0/Pietri1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINTITLE inherited via CROSSREF from HistoireduChristianisme/TITLE" ] + "section0/HistoireduChristianisme/volumes" -> "section0/Pietri1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/VOLUMES inherited via CROSSREF from HistoireduChristianisme/VOLUMES" ] + "section0/Pietri1998/editor" -> "section0/Maraval1998/editor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/EDITOR inherited via CROSSREF from Pietri1998/EDITOR" ] "section0/Pietri1998/location" -> "section0/Maraval1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/LOCATION inherited via CROSSREF from Pietri1998/LOCATION" ] - "section0/Pietri1998/year" -> "section0/Maraval1998/year" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/YEAR inherited via CROSSREF from Pietri1998/YEAR" ] - "section0/Pietri1998/mainsubtitle" -> "section0/Maraval1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINSUBTITLE inherited via CROSSREF from Pietri1998/MAINSUBTITLE" ] - "section0/Pietri1998/volume" -> "section0/Maraval1998/volume" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUME inherited via CROSSREF from Pietri1998/VOLUME" ] "section0/Pietri1998/maineditor" -> "section0/Maraval1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINEDITOR inherited via CROSSREF from Pietri1998/MAINEDITOR" ] - "section0/Pietri1998/title" -> "section0/Maraval1998/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/BOOKTITLE inherited via CROSSREF from Pietri1998/TITLE" ] - "section0/Pietri1998/publisher" -> "section0/Maraval1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/PUBLISHER inherited via CROSSREF from Pietri1998/PUBLISHER" ] + "section0/Pietri1998/mainsubtitle" -> "section0/Maraval1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINSUBTITLE inherited via CROSSREF from Pietri1998/MAINSUBTITLE" ] "section0/Pietri1998/maintitle" -> "section0/Maraval1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/MAINTITLE inherited via CROSSREF from Pietri1998/MAINTITLE" ] - "section0/Pietri1998/editor" -> "section0/Maraval1998/editor" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/EDITOR inherited via CROSSREF from Pietri1998/EDITOR" ] + "section0/Pietri1998/publisher" -> "section0/Maraval1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/PUBLISHER inherited via CROSSREF from Pietri1998/PUBLISHER" ] + "section0/Pietri1998/title" -> "section0/Maraval1998/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/BOOKTITLE inherited via CROSSREF from Pietri1998/TITLE" ] + "section0/Pietri1998/volume" -> "section0/Maraval1998/volume" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUME inherited via CROSSREF from Pietri1998/VOLUME" ] "section0/Pietri1998/volumes" -> "section0/Maraval1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/VOLUMES inherited via CROSSREF from Pietri1998/VOLUMES" ] - "section0/HistoireduChristianisme/subtitle" -> "section0/Pietri1998/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINSUBTITLE inherited via CROSSREF from HistoireduChristianisme/SUBTITLE" ] - "section0/HistoireduChristianisme/title" -> "section0/Pietri1998/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINTITLE inherited via CROSSREF from HistoireduChristianisme/TITLE" ] - "section0/HistoireduChristianisme/editor" -> "section0/Pietri1998/maineditor" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/MAINEDITOR inherited via CROSSREF from HistoireduChristianisme/EDITOR" ] - "section0/HistoireduChristianisme/publisher" -> "section0/Pietri1998/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/PUBLISHER inherited via CROSSREF from HistoireduChristianisme/PUBLISHER" ] - "section0/HistoireduChristianisme/volumes" -> "section0/Pietri1998/volumes" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/VOLUMES inherited via CROSSREF from HistoireduChristianisme/VOLUMES" ] - "section0/HistoireduChristianisme/location" -> "section0/Pietri1998/location" [ penwidth="2.0", color="#7d7879", tooltip="Pietri1998/LOCATION inherited via CROSSREF from HistoireduChristianisme/LOCATION" ] + "section0/Pietri1998/year" -> "section0/Maraval1998/year" [ penwidth="2.0", color="#7d7879", tooltip="Maraval1998/YEAR inherited via CROSSREF from Pietri1998/YEAR" ] } Binary files old/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf and new/doc/latex/biblatex-morenames/documentation/example-maineditor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py new/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py --- old/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/generate-crossref-graphs.py 2016-11-25 19:28:15.000000000 +0100 @@ -9,9 +9,15 @@ import os +# specific preamble for some file +specific_preamble = { + "example-bookineditor-BookineditorFromEditor":"\\toggletrue{BookineditorFromEditor}\n" +} + #List all the files on the current directory directory_files = os.listdir(".") + #Loop on them, and for the .bib file, generate the .tex, .dot and .pdf file for file_name in directory_files: basename, ext = os.path.splitext(file_name) @@ -22,8 +28,12 @@ # write the .tex file content tex_file_name = basename + ".tex" tex_file_content = "\documentclass{article}\n\ - \\usepackage[bibstyle=morenames]{biblatex}\n\ - \\bibliography{" + file_name + "}\n\ + \\usepackage[bibstyle=morenames]{biblatex}\n" + + if basename in specific_preamble: + tex_file_content = tex_file_content + specific_preamble[basename] + + tex_file_content = tex_file_content + "\\bibliography{" + file_name + "}\n\ \\begin{document}\n\ \\nocite{*}\n\ \end{document}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-morenames/documentation/latexmkrc new/doc/latex/biblatex-morenames/documentation/latexmkrc --- old/doc/latex/biblatex-morenames/documentation/latexmkrc 2016-04-07 22:52:10.000000000 +0200 +++ new/doc/latex/biblatex-morenames/documentation/latexmkrc 2017-01-26 00:01:03.000000000 +0100 @@ -1,2 +1,2 @@ -$pdflatex = "xelatex --shell-escape %S"; -$pdf_mode = "1"; +$xelatex = "xelatex --shell-escape --no-pdf %S"; +$pdf_mode = 5; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-morenames.doc.tlpobj new/tlpkg/tlpobj/biblatex-morenames.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-morenames.doc.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-morenames.doc.tlpobj 2017-04-14 17:31:53.000000000 +0200 @@ -1,12 +1,15 @@ name biblatex-morenames.doc category Package -revision 40325 +revision 43049 shortdesc doc files of biblatex-morenames relocated 1 -docfiles size=49 +docfiles size=64 RELOC/doc/latex/biblatex-morenames/README RELOC/doc/latex/biblatex-morenames/documentation/biblatex-morenames.pdf RELOC/doc/latex/biblatex-morenames/documentation/biblatex-morenames.tex + RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.bib + RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.dot + RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor-BookineditorFromEditor.pdf RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor.bib RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor.dot RELOC/doc/latex/biblatex-morenames/documentation/example-bookineditor.pdf ++++++ biblatex-morenames.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-morenames/morenames.bbx new/tex/latex/biblatex-morenames/morenames.bbx --- old/tex/latex/biblatex-morenames/morenames.bbx 2016-04-07 22:52:10.000000000 +0200 +++ new/tex/latex/biblatex-morenames/morenames.bbx 2017-01-26 00:01:03.000000000 +0100 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{morenames.bbx} -[2016/04/06 v1.0.0 biblatex bibliography style to have more name fields (MR)] +[2017/01/25 v1.3.1 biblatex bibliography style to have more name fields (MR)] %0. Preamble @@ -28,6 +28,36 @@ \inherit{editor}{maineditor} } +%1.two optionnal data inheritances +\providetoggle{IneditorFromEditor}% +\providetoggle{BookineditorFromEditor}% +\AtEndPreamble{% + \iftoggle{IneditorFromEditor}{% + \DeclareDataInheritance{book,mvbook}{inbook}{% + \inherit{editor}{ineditor}% + \inherit{editor}{editor}% + }% + \ifdefined\DeclareDatafieldSet + \DeclareDatafieldSet{ineditor}{ + \member[field=ineditor] + } + \fi + }% + {} + \iftoggle{BookineditorFromEditor}{% + \DeclareDataInheritance{book,mvbook}{bookinbook}{% + \inherit{editor}{bookineditor}% + \inherit{editor}{editor}% + }% + \ifdefined\DeclareDatafieldSet + \DeclareDatafieldSet{bookineditor}{ + \member[field=bookineditor] + } + \fi + }% + {}% +} + %2. New label names \DeclareLabelname[collection,proceedings,reference]{% @@ -60,17 +90,17 @@ \ifboolexpr{% test \ifusemaineditor and - not test {\ifnameundef{maineditor}} + not test {\ifnameundef{maineditor}}% }{% - \usebibmacro{bbx:dashcheck} - {\bibnamedash} + \usebibmacro{bbx:dashcheck}% + {\bibnamedash}% {\printnames{maineditor}% \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% \usebibmacro{maineditor+othersstrg}% \clearname{maineditor}% - } - {\usebibmacro{bbx:editor}{editor+othersstrg}} + }% + {\usebibmacro{bbx:editor}{editor+othersstrg}}% } % Inspired from editor+othersstrg macro @@ -89,7 +119,7 @@ or test {\ifandothers{maineditor}} } - {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}s}}% {\edef\abx@tempa{\thefield{editortype}}}}% \let\abx@tempb=\empty \ifnamesequal{maineditor}{translator} @@ -119,6 +149,11 @@ % 3.2 Patching maintitle+title in order to add the maineditor in @incollection (original was defined in standard.bbx) % + +\newcommand{\morenames@failpatch@macro}[1]{% + \PackageError{biblatex-morenames}{Fail to patch `#1` macro}{}% +} + \newbibmacro*{bymaineditor+others}{% \ifnameundef{maineditor} {} @@ -136,21 +171,25 @@ \usebibmacro{bymaineditor+others}% } {} - {} + {\morenames@failpatch@macro{maintitle+booktitle}} % 3.3 Patching @inbook and @article drivers in order to add the ineditor +\newcommand{\morenames@failpatch@driver}[1]{% + \PackageError{biblatex-morenames}{Fail to patch `#1` driver}{}% +} + \xpatchbibdriver{inbook}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{byineditor}} {} - {} + {\morenames@failpatch@driver{inbook}} \xpatchbibdriver{article}% {\usebibmacro{byauthor}} {\usebibmacro{byauthor}\newunit\usebibmacro{byineditor}} {} - {} + {\morenames@failpatch@driver{article}} \DeclareNameAlias{bookineditor}[byeditor]{ineditor} @@ -160,17 +199,26 @@ {\usebibmacro{bytypestrg}{ineditor}{editor}% \setunit{\addspace}% \printnames[byeditor]{ineditor}% - \newunit}% + \newunit% + \ifnamesequal{ineditor}{editor}% + {\clearname{editor}}% + {}% + }% } -\newbibmacro*{bybookineditor}{% - \ifnameundef{bookineditor} - {} - {\usebibmacro{bytypestrg}{bookineditor}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{bookineditor}% - \newunit}% - } - +\ifdefined\abx@macro@bybookineditor\else% + \newbibmacro*{bybookineditor}{% + \ifnameundef{bookineditor} + {}% + {\usebibmacro{bytypestrg}{bookineditor}{editor}% + \setunit{\addspace}% + \printnames[byeditor]{bookineditor}% + \newunit% + \ifnamesequal{bookineditor}{editor}% + {\clearname{editor}}% + {}% + }% + }% +\fi% \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-morenames/morenames.dbx new/tex/latex/biblatex-morenames/morenames.dbx --- old/tex/latex/biblatex-morenames/morenames.dbx 2016-04-07 22:52:10.000000000 +0200 +++ new/tex/latex/biblatex-morenames/morenames.dbx 2017-01-26 00:01:03.000000000 +0100 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{morenames.dbx} -[2016/04/06 v1.0.0 biblatex bibliography style to have more name fields (MR)] +[2017/01/25 v1.3.1 biblatex bibliography style to have more name fields (MR)] %1. New fields \DeclareDatamodelFields[type=list,datatype=name]{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-morenames.tlpobj new/tlpkg/tlpobj/biblatex-morenames.tlpobj --- old/tlpkg/tlpobj/biblatex-morenames.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-morenames.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-morenames category Package -revision 40325 +revision 43049 shortdesc New names for standard BibLaTeX entry type relocated 1 longdesc This package adds new fields of "name" type to the standard @@ -14,7 +14,7 @@ RELOC/tex/latex/biblatex-morenames/morenames.bbx RELOC/tex/latex/biblatex-morenames/morenames.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-morenames -catalogue-date 2016-04-14 05:53:30 +0200 +catalogue-date 2017-01-25 13:23:43 +0100 catalogue-license lppl1.3 catalogue-topics humanities biblatex -catalogue-version 1.0.0 +catalogue-version 1.3.1 ++++++ biblatex-multiple-dm.doc.tar.xz ++++++ ++++++ biblatex-multiple-dm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-multiple-dm.tlpobj new/tlpkg/tlpobj/biblatex-multiple-dm.tlpobj --- old/tlpkg/tlpobj/biblatex-multiple-dm.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-multiple-dm.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/biblatex-multiple-dm/multiple-dm.bbx RELOC/tex/latex/biblatex-multiple-dm/multiple-dm.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-multiple-dm -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex catalogue-version 1.0.1 ++++++ biblatex-musuos.doc.tar.xz ++++++ ++++++ biblatex-musuos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-musuos.tlpobj new/tlpkg/tlpobj/biblatex-musuos.tlpobj --- old/tlpkg/tlpobj/biblatex-musuos.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-musuos.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/biblatex-musuos/musuos.cbx catalogue-also musuos catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-musuos -catalogue-date 2015-08-03 06:38:55 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics biblatex music catalogue-version 1.0 ++++++ biblatex-nature.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-nature/biblatex-nature.bib new/doc/latex/biblatex-nature/biblatex-nature.bib --- old/doc/latex/biblatex-nature/biblatex-nature.bib 2016-03-12 00:39:01.000000000 +0100 +++ new/doc/latex/biblatex-nature/biblatex-nature.bib 2017-03-03 00:01:04.000000000 +0100 @@ -78,9 +78,10 @@ } @Online{Corina2006, - title = {CORINA: Generation of 3D coordinates}, - url = {http://www.molecular-networks.com/software/corina/index.html}, - year = {2006} + title = {CORINA: Generation of 3D coordinates}, + url = {http://www.molecular-networks.com/software/corina/index.html}, + year = {2006}, + urlyear = {2006} } @Book{Coghill2006, @@ -263,7 +264,7 @@ title = {Alkylation of boron trifluoride with pentafluorophenyl Grignard reagent}, year = {2003}, - urlyear = {2008-10-08}, + urldate = {2008-10-08}, url = {http://www.syntheticpages.org/pages/215} } @@ -386,7 +387,7 @@ } %% -%% Copyright (C) 2010-2013,2016 by +%% Copyright (C) 2010-2013,2016,2017 by %% Joseph Wright <joseph.wright at morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of Binary files old/doc/latex/biblatex-nature/biblatex-nature.pdf and new/doc/latex/biblatex-nature/biblatex-nature.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-nature/biblatex-nature.tex new/doc/latex/biblatex-nature/biblatex-nature.tex --- old/doc/latex/biblatex-nature/biblatex-nature.tex 2016-03-13 22:18:46.000000000 +0100 +++ new/doc/latex/biblatex-nature/biblatex-nature.tex 2017-03-03 00:01:04.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{nature} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.2g, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.3b, last revised 2017/03/01.}} +\date{Released 2017/03/01} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -54,6 +54,11 @@ do not. To control this behaviour, the boolean option \opt{articletitle} is provided; this is set \opt{true} as standard. +\DescribeOption{intitle} +The boolean option \opt{intitle} determines whether the title of books +is printed for \texttt{inbook} and \texttt{incollection} entries. It is +set \opt{false} as standard. + Suggestions for improvement and bug reports can be logged in the package issue database, found at \url{https://github.com/josephwright/biblatex-nature/issues}, or can @@ -83,14 +88,17 @@ entries when the \opt{articletitle} option is \opt{true}} \changes{v1.2f}{2016/03/10}{Track \pkg{biblatex} changes} \changes{v1.2g}{2016/03/13}{Ensure style works with both backends} - +\changes{v1.2h}{2016/09/13}{Work properly with \texttt{urldate} option} +\changes{v1.3}{2016/10/22}{New \opt{intitle} option} +\changes{v1.3a}{2016/10/26}{Correct \opt{intitle} default value} +\changes{v1.3b}{2017/03/01}{Update \texttt{url} formatting} \PrintChanges \end{document} %% -%% Copyright (C) 2010-2013,2016 by +%% Copyright (C) 2010-2013,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-nature.doc.tlpobj new/tlpkg/tlpobj/biblatex-nature.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-nature.doc.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-nature.doc.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-nature.doc category Package -revision 40016 +revision 43382 shortdesc doc files of biblatex-nature relocated 1 -docfiles size=100 +docfiles size=101 RELOC/doc/latex/biblatex-nature/LICENSE.md RELOC/doc/latex/biblatex-nature/README.md RELOC/doc/latex/biblatex-nature/biblatex-nature.bib ++++++ biblatex-nature.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-nature/nature.bbx new/tex/latex/biblatex-nature/nature.bbx --- old/tex/latex/biblatex-nature/nature.bbx 2016-03-13 22:18:46.000000000 +0100 +++ new/tex/latex/biblatex-nature/nature.bbx 2017-03-03 00:01:06.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{nature.bbx}[2016/03/13 v1.2g biblatex bibliography style] +\ProvidesFile{nature.bbx}[2017/03/01 v1.3b biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -18,25 +18,27 @@ \DeclareBibliographyOption{articletitle}[true]{% \settoggle{bbx:articletitle}{#1}% } +\newtoggle{bbx:intitle} +\DeclareBibliographyOption{intitle}[true]{% + \settoggle{bbx:intitle}{#1}% +} -% Alter settings that carry through from biblatex \ExecuteBibliographyOptions{ - articletitle , - giveninits , - maxnames = 5 , - maxcitenames = 2 , - punctfont , - useprefix + articletitle , + giveninits , + maxnames = 5 , + maxcitenames = 2 , + punctfont , + urldate = year , + useprefix , } +\@ifpackagelater{biblatex}{2016/03/27} + {\ExecuteBibliographyOptions{giveninits}} + {\ExecuteBibliographyOptions{firstinits}} + % Modify the name format -\@ifpackageloaded{biblatex_legacy} - { - \DeclareNameFormat{default}{% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}% - } - } +\@ifpackagelater{biblatex}{2016/03/27} { \DeclareNameFormat{default}{% \nameparts{#1}% @@ -48,6 +50,12 @@ \usebibmacro{name:andothers}% } } + { + \DeclareNameFormat{default}{% + \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } + } % Field formats for the bibliography environment \DeclareFieldFormat{labelnumberwidth}{#1\adddot} @@ -70,7 +78,8 @@ \ifbibstring{#1}{\bibstring{#1}}{#1}% }% } -\DeclareFieldFormat{url}{\textless\url{#1}\textgreater} +\DeclareFieldFormat{url}{\url{#1}} +\DeclareFieldFormat{urldate}{\mkbibparens{#1}} \DeclareFieldFormat*{volume}{\mkbibbold{#1}} \DeclareFieldFormat[book]{volume}{#1} @@ -411,6 +420,12 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iftoggle{bbx:intitle} + {% + \usebibmacro{title}% + \newblock + } + {}% \usebibmacro{in:}% \usebibmacro{bybookauthor}% \setunit*{\newunitpunct}\newblock @@ -453,6 +468,12 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iftoggle{bbx:intitle} + {% + \usebibmacro{title}% + \newblock + } + {}% \usebibmacro{in:}% \usebibmacro{maintitle+booktitle}% \newunit\newblock @@ -556,11 +577,7 @@ {\usebibmacro{eprint}} {}% \newunit\newblock - \printfield{url} - \setunit*{\addspace}% - \iffieldundef{year} - {\printfield[parens]{urlyear}} - {\printfield[parens]{year}}% + \usebibmacro{url+urldate}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock @@ -647,7 +664,7 @@ } %% -%% Copyright (C) 2010-2013,2016 by +%% Copyright (C) 2010-2013,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-nature/nature.cbx new/tex/latex/biblatex-nature/nature.cbx --- old/tex/latex/biblatex-nature/nature.cbx 2016-03-13 22:18:46.000000000 +0100 +++ new/tex/latex/biblatex-nature/nature.cbx 2017-03-03 00:01:06.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{nature.cbx}[2016/03/13 v1.2g biblatex citation style] +\ProvidesFile{nature.cbx}[2017/03/01 v1.3b biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -19,7 +19,7 @@ } %% -%% Copyright (C) 2010-2013,2016 by +%% Copyright (C) 2010-2013,2016,2017 by %% Joseph Wright <joseph.wright(a)morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-nature.tlpobj new/tlpkg/tlpobj/biblatex-nature.tlpobj --- old/tlpkg/tlpobj/biblatex-nature.tlpobj 2016-04-14 18:42:22.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-nature.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -1,15 +1,15 @@ name biblatex-nature category Package -revision 40016 +revision 43382 shortdesc BibLaTeX support for Nature relocated 1 -longdesc The bundle offers styles that allow authors to use biblatex +longdesc The bundle offers styles that allow authors to use BibLaTeX longdesc when preparing papers for submission to the journal Nature. runfiles size=5 RELOC/tex/latex/biblatex-nature/nature.bbx RELOC/tex/latex/biblatex-nature/nature.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-nature -catalogue-date 2016-03-13 13:28:21 +0100 +catalogue-date 2017-03-01 22:25:00 +0100 catalogue-license lppl1.3 catalogue-topics biblatex journalpub -catalogue-version 1.2g +catalogue-version 1.3b ++++++ biblatex-nejm.doc.tar.xz ++++++ ++++++ biblatex-nejm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-nejm.tlpobj new/tlpkg/tlpobj/biblatex-nejm.tlpobj --- old/tlpkg/tlpobj/biblatex-nejm.tlpobj 2016-04-14 18:42:23.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-nejm.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -3,13 +3,13 @@ revision 24011 shortdesc BibLaTeX style for the New England Journal of Medicine (NEJM) relocated 1 -longdesc This is a biblatex numeric style based on the design of the New +longdesc This is a BibLaTeX numeric style based on the design of the New longdesc England Journal of Medicine (NEJM). runfiles size=3 RELOC/tex/latex/biblatex-nejm/nejm.bbx RELOC/tex/latex/biblatex-nejm/nejm.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-nejm -catalogue-date 2015-08-03 05:58:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex catalogue-version 0.4 ++++++ biblatex-opcit-booktitle.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib --- old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib 2015-06-20 00:33:17.000000000 +0200 +++ new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib 2016-11-25 19:28:16.000000000 +0100 @@ -1,5 +1,26 @@ +@bookinarticle{BHG1850z_o, + Crossref = {Halkin1961}, + Pages = {244-252}, + Title = {Τοῦ ἁγίου ἀποστόλου Τίτου, ἐπισκόπου γενομένου Κρήτης πόλεως Γορτύνης, μαθητοῦ τοῦ ἁγίου ἀποστόλου Παύλου}, + } + +@bookinarticle{BHG1850z_r, + Crossref = {Halkin1961}, + Pages = {252-256}, + Title = {Τοῦ ἁγίου ἀποστόλου Τίτου, ἐπισκόπου Γορτύνης τῆς Κρητῶν νήσου}, + } + +@article{Halkin1961, + Author = {François Halkin}, + Date = {1961}, + Journal = {Analecta Bollandiana}, + Number = {79}, + Pages = {241-256}, + Title = {La légende crétoise de Saint Tite} +} + @incollection{Klausner1997, Author = {David N. Klausner}, Crossref = {Izydorczyk1997}, Binary files old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf and new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex --- old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex 2015-10-20 00:23:55.000000000 +0200 +++ new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex 2016-11-25 19:28:16.000000000 +0100 @@ -1,8 +1,9 @@ \documentclass{article} -\usepackage{fontspec} +\usepackage{libertine} \usepackage{polyglossia} \setmainlanguage{french} -\usepackage[bibstyle=verbose,citestyle=verbose-trad2,citepages=omit]{biblatex} +\usepackage[tools={bookinother,morenames}]{biblatex-multiple-dm} +\usepackage[bibstyle=multiple-dm,citestyle=verbose-trad2,citepages=omit]{biblatex} \usepackage{biblatex-opcit-booktitle} \bibliography{biblatex-opcit-booktitle-example.bib} \usepackage{hyperref} @@ -12,7 +13,7 @@ \cite{Klausner1997} - +\cite{BHG1850z_o} \cite{Pleiade_Barnabe} @@ -25,5 +26,8 @@ \cite{Pleiade_Tite} \cite[22]{Pseudo-Hippolyte} + +\cite{BHG1850z_r} + \end{document} Binary files old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf and new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex --- old/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex 2016-03-28 00:18:02.000000000 +0200 +++ new/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex 2017-03-27 23:42:07.000000000 +0200 @@ -22,8 +22,8 @@ subtitle={Abbreviated references}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.3.0}, - date={2016/03/27}, + revision={1.8.0}, + date={2017/03/27}, url={https://git.framasoft.org/maieul/biblatex-opcit-booktitle}} % biblatex @@ -83,7 +83,7 @@ \section{Use} -The \verb+biblatex-opcit-booktitle+ package must be loaded after the \verb+biblatex+ package. You must use a \verb+verbose-trad+ citation style. For example: +The \verb+biblatex-opcit-booktitle+ package must be loaded after the \verb+biblatex+ package, which must be at version 3.4 or greater. You must use a \verb+verbose-trad+ citation style. For example: \begin{minted}{latex} \usepackage[bibstyle=verbose,citestyle=verbose-trad1,citepages=omit]{biblatex} @@ -158,12 +158,46 @@ \usebibmacro{cite:test:ifrelated} \end{minted} +\subsection{Use with own citation style} + +If you have created your own citation style file (\verb.+cbx.), you must create a bibliographic driver called \verb+inbook:rel:<yourcitationstyle>+. You can look at the model \verb+inbook:rel:verbose-trad-xxx+ in the .sty file, or just use \cs{DeclareBibliographyAlias} to use an already existing model. + +If your citation style is public (i. e. published on CTAN), please contact us: we could provide the bibliographic driver directly in this package. + +If you have created your own \verb+cite+ bibmacro, this bibmacro must call, directly or indirectly the `cite:test:ifrelated` bibmacro (or your adaptation of this bibmacro). + + \subsection{Customization} You can change the \verb+inbook:rel:verbose-trad-xxx+ bibliographic driver to customize the way the main title is printed, \verb+xxx+ meaning 1, 2, or 3, depending of you specific citation style. +\subsection{Use with new entrytypes} + +If you create new entrytypes, as the \emph{biblatex-bookintother} package does, you can let know to \emph{biblatex-opcit-booktitle} that these entry types are concerned by using short form of the main entry. + + +To do it, just add in your \verb+.bbx+ or \verb+.dbx+ file: +\begin{minted}{latex} +\listadd\opcit@booktitle@entrytypes{<newentrytype>} +\end{minted} + +\verb+<newentrytype>+ must be the new sub-entrytype concerned. For example, the \emph{biblatex-bookinother} package contains: + +\begin{minted}{latex} +\listadd\opcit@booktitle@entrytypes{inarticle} +\end{minted} + +In general, you want to have the volume number after the title of the volume. However, for some case, it could be useful to not have it. In this case, add you subtype entry to the \verb+\opcit@booktitle@entrytypes@novolume+ list. For example, the \emph{biblatex-bookinother} package contains: + +\begin{minted}{latex} +\listadd\opcit@booktitle@entrytypes@novolume{inarticle} +\end{minted} + +Depending of the fields of the new entry, you could have to modify the \verb+inbook:rel:verbose-trad-xxx+. But in this case, please contact us, in order to know if we could provide a generic mechanism directly in this package. \section{Credits} + + This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2015. It is freely inspired by Paul Stanley code.\footnote{\url{http://tex.stackexchange.com/a/172777/7712}.} It is licensed on the \emph{\LaTeX\ Project Public License}.\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}. @@ -175,6 +209,31 @@ \begin{changelog} +\begin{release}{1.8.0}{2016-03-27} + \item Add support entrytype where you don't need to print volume number. +\end{release} + +\begin{release}{1.7.0}{2016-09-08} + \item Add support for the \option{citetracker=context} option of \biblatex. +\end{release} + +\begin{release}{1.6.0}{2016-09-08} + \item Add hooks for new entrytype. +\end{release} + +\begin{release}{1.5.0a}{2016-06-12} + \item Precisions in the handbook. +\end{release} + + +\begin{release}{1.5.0}{2016-06-09} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + +\begin{release}{1.4.0}{2016-06-07} + \item Use new tool of biblatex 3.4. + \item Require biblatex 3.4. +\end{release} \begin{release}{1.3.0}{2016-03-27} \item Add \emph{op. cit.} also for verbose-trad1. \item Set the entry type for the \emph{op. cit.} as the entry type of the main entry. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-opcit-booktitle.doc.tlpobj new/tlpkg/tlpobj/biblatex-opcit-booktitle.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-opcit-booktitle.doc.tlpobj 2016-04-14 18:42:23.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-opcit-booktitle.doc.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-opcit-booktitle.doc category Package -revision 40157 +revision 43621 shortdesc doc files of biblatex-opcit-booktitle relocated 1 -docfiles size=32 +docfiles size=35 RELOC/doc/latex/biblatex-opcit-booktitle/README RELOC/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib RELOC/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf ++++++ biblatex-opcit-booktitle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty new/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty --- old/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty 2016-03-28 00:18:02.000000000 +0200 +++ new/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty 2017-03-27 23:42:07.000000000 +0200 @@ -15,9 +15,17 @@ % % The Current Maintainer of this work is Maïeul Rouquette \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-opcit-booktitle}[2016/03/27 v1.3.0 Manage op. cit. when using subentry] +\ProvidesPackage{biblatex-opcit-booktitle}[2017/03/27 v1.8.0 Manage op. cit. when using subentry] \RequirePackage{xpatch} +\def\opcit@booktitle@entrytypes@novolume{} +% Declaration of the entry concerned. Some package could have already add their own entry +\listadd\opcit@booktitle@entrytypes{inbook} +\listadd\opcit@booktitle@entrytypes{incollection} +\listadd\opcit@booktitle@entrytypes{inproceedings} +\listadd\opcit@booktitle@entrytypes{bookinbook} + + \DeclareFieldFormat{bibhypertarget:crossref}{% \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{crossref}}{#1}} @@ -26,36 +34,68 @@ \newbibmacro*{cite:seen:related}{% - {\xifinlistcs{\thefield{crossref}}{blx@bsee@\the\c@refsection}% - {}% - {\listcsxadd{blx@bsee@\the\c@refsection}{\thefield{crossref}}}}} + \ifboolexpr{test{\ifdefequal{\blx@imc@ifciteseen}{\blx@ifciteseen@context}} and togl{blx@footnote}}%Mode context + footnote? + {% + \xifinlistcs{\thefield{crossref}}{blx@fsee@\the\c@refsection}% + {}% + {\listcsxadd{blx@fsee@\the\c@refsection}{\thefield{crossref}}}% + }% + {% + \xifinlistcs{\thefield{crossref}}{blx@bsee@\the\c@refsection}% + {}% + {\listcsxadd{blx@bsee@\the\c@refsection}{\thefield{crossref}}}% + }% +}% + \newcommand{\ifrelatedunseen}[2]{% - \xifinlistcs{\thefield{crossref}}{blx@bsee@\the\c@refsection}% + \ifboolexpr{test{\ifdefequal{\blx@imc@ifciteseen}{\blx@ifciteseen@context}} and togl{blx@footnote}}%Mode context + footnote? + {% + \xifinlistcs{\thefield{crossref}}{blx@fsee@\the\c@refsection}% + {#2}% + {#1}% + }% + {% + \xifinlistcs{\thefield{crossref}}{blx@bsee@\the\c@refsection}% {#2}% - {#1}} + {#1}% + }% +}% + + + +\RequirePackage{ltxcmds} +\newcommand{\opcit@booktitle@failpatch}[2]{% + \PackageError{opcit-booktitle}{Fail to patch `#1` bibmacro (#2)}{}% +} % verbose-trad-1 and verbose-trad2 -\xpatchbibmacro{cite}% - {\usebibmacro{cite:full}% - \usebibmacro{cite:save}}% - {\usebibmacro{cite:test:ifrelated}}% - {}% - {}% +\ifboolexpr{% + test{\ltx(a)iffileloaded{verbose-trad2.cbx}}% + or test{\ltx(a)iffileloaded{verbose-trad1.cbx}}% + }{% + \xpatchbibmacro{cite}% + {\usebibmacro{cite:full}% + \usebibmacro{cite:save}}% + {\usebibmacro{cite:test:ifrelated}}% + {}% + {\opcit@booktitle@failpatch{cite}{verbose-trad1.cbx or verbose-trad2.cbx}}% +}% +{} % verbose-trad3. Not that lines must be applied AFTER the previous one -\xpatchbibmacro{cite}% - {\usebibmacro{cite:full}}% - {\usebibmacro{cite:test:ifrelated:verbose-trad3}}% - {}% - {}% +\ltx(a)iffileloaded{verbose-trad3.cbx}{% + \xpatchbibmacro{cite}% + {\usebibmacro{cite:full}}% + {\usebibmacro{cite:test:ifrelated:verbose-trad3}}% + {}% + {\opcit@booktitle@failpatch{cite}{verbose-trad3.cbx}}% +}{} + \newbibmacro*{cite:test:ifrelated}% {\ifboolexpr {% test {\iffieldundef{crossref}}% - or not (test {\ifentrytype{inbook}}% - or test {\ifentrytype{incollection}}% - or test {\ifentrytype{inproceedings}}% - or test {\ifentrytype{bookinbook}})}% + or not (test {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes}})}% {\usebibmacro{cite:full}% \usebibmacro{cite:save}}% {\ifrelatedunseen% @@ -68,10 +108,7 @@ \newbibmacro*{cite:test:ifrelated:verbose-trad3}% {\ifboolexpr {% test {\iffieldundef{crossref}}% - or not (test {\ifentrytype{inbook}}% - or test {\ifentrytype{incollection}}% - or test {\ifentrytype{inproceedings}}% - or test {\ifentrytype{bookinbook}})}% + or not (test {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes}})}% {\usebibmacro{cite:full}% }% {\ifrelatedunseen% @@ -117,13 +154,18 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}} + {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes@novolume}% + {}% + {% + \printfield{volume}% + \printfield{part}}% + }% {}% \newunit% \restorefield{entrytype}{\bookentrytype}% @@ -157,13 +199,18 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}} + {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes@novolume}% + {}% + {% + \printfield{volume}% + \printfield{part}}% + }% {}% \newunit% \restorefield{entrytype}{\bookentrytype}% @@ -185,7 +232,7 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \printnames{labelname}% - \setunit*{\nametitledelim}% + \setunit*{\printdelim{nametitledelim}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -194,13 +241,18 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% \iffieldundef{maintitle}% - {\printfield{volume}% - \printfield{part}} + {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes@novolume}% + {}% + {% + \printfield{volume}% + \printfield{part}}% + }% {}% }% \newunit\newblock @@ -215,4 +267,12 @@ {}% \usebibmacro{finentry}} +\newbibmacro{inbook:rel:bookauthor}{% + \ifnameundef{bookauthor}% + {} + {% + \usebibmacro{bybookauthor}% + \setunit{\labelnamepunct}\newblock% + }% +} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-opcit-booktitle.tlpobj new/tlpkg/tlpobj/biblatex-opcit-booktitle.tlpobj --- old/tlpkg/tlpobj/biblatex-opcit-booktitle.tlpobj 2016-04-14 18:42:23.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-opcit-booktitle.tlpobj 2017-04-14 17:31:54.000000000 +0200 @@ -1,20 +1,20 @@ name biblatex-opcit-booktitle category Package -revision 40157 +revision 43621 shortdesc Use op. cit. for the booktitle of a subentry relocated 1 longdesc The default citation styles verbose-trad1+; verbose-trad2 ; -longdesc verbose-trad3 use the op. cit. form in order to have shorter -longdesc reference when a title have been already cited. However, when +longdesc verbose-trad3 use the op. cit. form in order to have a shorter +longdesc reference when a title has already been cited. However, when longdesc you cite two entries which share the same booktitle but not the longdesc same title, the op. cit. mechanism does not work. This package longdesc enables to obtain references like this: Author1, Title, in -longdesc Booktitle, Location, Publiser, Year, pages xxx Author2, Title2, -longdesc in Booktitle, op. cit, pages. +longdesc Booktitle, Location, Publisher, Year, pages xxx Author2, +longdesc Title2, in Booktitle, op. cit, pages. runfiles size=2 RELOC/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle -catalogue-date 2016-03-27 13:38:12 +0200 +catalogue-date 2017-03-27 18:25:58 +0200 catalogue-license lppl1.3 catalogue-topics biblio biblatex -catalogue-version 1.3.0 +catalogue-version 1.8.0 ++++++ biblatex-philosophy.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf and new/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf differ Binary files old/doc/latex/biblatex-philosophy/examples.zip and new/doc/latex/biblatex-philosophy/examples.zip differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-philosophy/philosophy-examples.bib new/doc/latex/biblatex-philosophy/philosophy-examples.bib --- old/doc/latex/biblatex-philosophy/philosophy-examples.bib 2015-06-14 19:41:42.000000000 +0200 +++ new/doc/latex/biblatex-philosophy/philosophy-examples.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,912 +0,0 @@ -%% This BibTeX bibliography file was created using BibDesk. -%% http://bibdesk.sourceforge.net/ - - -%% Created for Ivan Valbusa at 2015-01-14 15:55:32 +0100 - - -%% Saved with string encoding Unicode (UTF-8) - - - -@book{Hobbes:works:elements-of-philosophy:maintitle, - Author = {Thomas Hobbes}, - Booksubtitle = {The First Section, Concerning Body}, - Date = {1994}, - Date-Added = {2013-04-04 16:56:05 +0200}, - Date-Modified = {2013-04-04 17:00:25 +0200}, - Location = {London}, - Maintitle = {The Collected Works of Thomas Hobbes}, - Publisher = {Routledge and Thoemmes Press}, - Subtitle = {Elements of Philosophy}, - Title = {Elements of Philosophy}, - Volume = {1}} - -@incollection{bohm:in-christische-philosophie:full, - Author = {Irmingard Böhm}, - Booktitle = {Modern Strömungen im 20. Jahrhundert}, - Date = {1990}, - Date-Added = {2013-04-04 16:48:27 +0200}, - Date-Modified = {2013-04-04 16:50:35 +0200}, - Editor = {Emerich Coreth SJ and Walter M. Neidl and georg Pfligersdorffer}, - Location = {Graz and Wien Köln}, - Maintitle = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, - Pages = {364-374}, - Publisher = {Styria}, - Title = {Lucien Laberthonnièere (1860--1932)}, - Volume = {3}} - -@incollection{braun:in-christische-philosophie:full, - Author = {Bernhard Braun}, - Booktitle = {Neue Ansätze im 19. Jahrhundert}, - Date = {1987}, - Date-Added = {2013-04-04 16:39:28 +0200}, - Date-Modified = {2013-04-04 16:42:59 +0200}, - Editor = {Emerich Coreth SJ and Walter M. Neidl and georg Pfligersdorffer}, - Location = {Graz and Wien Köln}, - Maintitle = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, - Pages = {285-305}, - Publisher = {Styria}, - Title = {Martin Deutiger (1815--1864)}, - Volume = {1}} - -@mvcollection{christische-philosophie, - Date = {1987}, - Date-Modified = {2013-04-04 16:47:22 +0200}, - Editor = {Emerich {Coreth SJ} and Walter M. Neidl and Georg Pfligersdorffer}, - Location = {Graz and Wien and Köln}, - Publisher = {Styria}, - Title = {Christische Philosophie im katolischen Denken del 19. und 20. Jahrhunderts}, - Volumes = {3}} - -@mvbook{wolff:gesammelte-werke, - Author = {Christian Wolff}, - Date = {1965/}, - Date-Added = {2013-04-04 16:20:39 +0200}, - Date-Modified = {2013-04-04 16:24:12 +0200}, - Editor = {J. Ecole and H.W. Arndt, J.E. Hofmann and M. Thomann and C.A. Corr}, - Location = {Hildesheim and New York}, - Note = {edizione fototipica}, - Publisher = {Olms}, - Title = {Gesammelte Werke}, - Volumes = {59}} - -@mvbook{hobbes:works, - Author = {Thomas Hobbes}, - Date = {1994}, - Date-Added = {2013-04-04 16:14:28 +0200}, - Date-Modified = {2013-04-04 16:14:28 +0200}, - Editor = {Sir William Molesworth}, - Location = {London}, - Note = {with a new introduction by Dr G.A.J. Rogers}, - Publisher = {Routledge and Thoemmes Press}, - Title = {The Collected Works of Thomas Hobbes}, - Volumes = {12}} - -@bookinbook{Hobbes:works:elements-of-philosophy, - Author = {Thomas Hobbes}, - Booktitle = {The Collected Works of Thomas Hobbes}, - Date = {1994}, - Date-Added = {2013-04-04 16:14:13 +0200}, - Date-Modified = {2013-04-04 16:14:13 +0200}, - Location = {London}, - Publisher = {Routledge and Thoemmes Press}, - Subtitle = {The First Section, Concerning Body}, - Title = {Elements of Philosophy}, - Volume = {1}} - -@bookinbook{rosmini:opere:idee, - Author = {Antonio Rosmini}, - Booktitle = {Ideologia e logica}, - Date = {2003}, - Date-Added = {2013-04-04 16:14:02 +0200}, - Date-Modified = {2013-04-04 16:14:02 +0200}, - Editor = {Istituto di Studi Filosofici -- Roma and Centro Internazionale di Studi Rosminiani -- Stresa}, - Location = {Roma}, - Maintitle = {Opere edite e inedite di Antonio Rosmini}, - Note = {a cura di Gaetano Messina}, - Number = {tomo I}, - Publisher = {Città Nuova Editrice}, - Title = {Nuovo saggio sull'origine delle idee}, - Volume = {3}} - -@inproceedings{Agati1991, -Hyphenation={french}, - Author = {Agati, Maria Luisa}, - Crossref = {Harlfinger1991}, - Date-Added = {2013-03-31 22:38:46 +0200}, - Date-Modified = {2015-01-14 14:55:32 +0000}, - Keywords = {esempio}, - Location = {Alessandria}, - Owner = {domenico}, - Pages = {47--66}, - Timestamp = {08.09.2012}, - Title = {Problemi di tratteggio e ductus nella minuscola libraria più antica}} - -@inproceedings{Alpers1991, - Author = {Alpers, Klaus}, - Crossref = {Harlfinger1991}, - Date-Added = {2013-03-31 22:38:28 +0200}, - Date-Modified = {2014-03-26 08:42:18 +0000}, - Keywords = {esempio}, - Location = {Alessandria}, - Owner = {domenico}, - Pages = {523--541}, - Timestamp = {08.09.2012}, - Title = {Marginalien zur Überlieferung der griechischen Etymologika}} - -@proceedings{Harlfinger1991, - Date-Added = {2013-03-31 22:38:28 +0200}, - Date-Modified = {2014-03-26 08:42:42 +0000}, - Editor = {Harlfinger, D. and Prato, G.}, - Eventdate = {1983-10-17/1983-10-23}, - Keywords = {sigle, atti}, - Location = {Alessandria}, - Number = {3}, - Owner = {domenico}, - Series = {Biblioteca di Scrittura e Civiltà}, - Shorthand = {\textit{PCG}}, - Sortshorthand = {PCG}, - Timestamp = {20.07.2011}, - Title = {Paleografia e codicologia greca}, - Titleaddon = {Atti del II Colloquio internazionale}, - Venue = {Berlino -- Wolfenbüttel}, - Year = {1991}} - -@book{aristotle:physics, - Annotation = {A \texttt{book} entry with a \texttt{translator} field}, - Author = {Aristotle}, - Booktitle = {Physics}, - Date = {1929}, - Date-Added = {2013-03-15 14:22:45 +0100}, - Date-Modified = {2014-03-27 13:11:07 +0000}, - Entrysubtype = {classic}, - Hyphenation = {american}, - Keywords = {primary,esempio}, - Location = {New York}, - Publisher = {G. P. Putnam}, - Shorttitle = {Physics}, - Title = {Physics}, - Translator = {Wicksteed, P. H. and Cornford, F. M.}} - -@book{Lobacevskij:1994, - Author = {Nikolaj Ivanovi\v{c} Loba\v{c}evskij}, - Booktitle = {Nuovi principi della geometria}, - Date = {1994}, - Date-Added = {2013-03-14 12:51:03 +0100}, - Date-Modified = {2013-03-15 16:42:38 +0100}, - Editor = {Lucio Lombarto Radice}, - Foreword = {Evandro Agazzi}, - Keywords = {esempio}, - Location = {Torino}, - Options = {origed}, - Origdate = {1835}, - Publisher = {Bollati Boringhieri}, - Subtitle = {Con una teoria completa delle parallele}, - Title = {Nuovi principi della geometria}, - Annote = {An entry typeset using the depreciated \texttt{orig-} fields mechanism}} - -@mvbook{knuth:ct, - Annotation = {A five-volume book cited as a whole. This is a \texttt{book} entry, note the \texttt{volumes} field}, - Author = {Knuth, Donald E.}, - Date = {1984/1986}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Indexsorttitle = {Computers & Typesetting}, - Location = {Reading, Mass.}, - Publisher = {Addison-Wesley}, - Sorttitle = {Computers & Typesetting}, - Sortyear = {1984-0}, - Title = {Computers \& Typesetting}, - Volumes = {5}} - -@bookinbook{knuth:ct:a, - Annotation = {The first volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields. We want this volume to be listed after the entry referring to the entire five-volume set. Also note the \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing packages that don't generate robust index entries require some control sequences to be protected from expansion}, - Author = {Knuth, Donald E.}, - Date = {1984}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Indexsorttitle = {The TeXbook}, - Indextitle = {\protect\TeX book, The}, - Location = {Reading, Mass.}, - Maintitle = {Computers \& Typesetting}, - Publisher = {Addison-Wesley}, - Shorttitle = {\TeX book}, - Sorttitle = {Computers & Typesetting A}, - Sortyear = {1984-1}, - Title = {The \TeX book}, - Volume = {A}} - -@bookinbook{knuth:ct:b, - Annotation = {The second volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields. Also note the \texttt{indexsorttitle} field}, - Author = {Knuth, Donald E.}, - Date = {1986}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Indexsorttitle = {TeX: The Program}, - Location = {Reading, Mass.}, - Maintitle = {Computers \& Typesetting}, - Publisher = {Addison-Wesley}, - Shorttitle = {\TeX}, - Sorttitle = {Computers & Typesetting B}, - Sortyear = {1986-1}, - Title = {\TeX: The Program}, - Volume = {B}} - -@bookinbook{knuth:ct:c, - Annotation = {The third volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields as well as the \texttt{indextitle} field}, - Author = {Knuth, Donald E.}, - Date = {1986}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Indextitle = {METAFONTbook, The}, - Location = {Reading, Mass.}, - Maintitle = {Computers \& Typesetting}, - Publisher = {Addison-Wesley}, - Shorttitle = {METAFONTbook}, - Sorttitle = {Computers & Typesetting C}, - Sortyear = {1986-2}, - Title = {The METAFONTbook}, - Volume = {C}} - -@bookinbook{knuth:ct:d, - Annotation = {The fourth volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields}, - Author = {Knuth, Donald E.}, - Date = {1986}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Location = {Reading, Mass.}, - Maintitle = {Computers \& Typesetting}, - Publisher = {Addison-Wesley}, - Shorttitle = {METAFONT}, - Sorttitle = {Computers & Typesetting D}, - Sortyear = {1986-3}, - Title = {METAFONT: The Program}, - Volume = {D}} - -@bookinbook{knuth:ct:e, - Annotation = {The fifth volume of a five-volume book. Note the \texttt{sorttitle} and \texttt{sortyear} fields}, - Author = {Knuth, Donald E.}, - Date = {1986}, - Date-Added = {2013-03-14 10:05:39 +0100}, - Date-Modified = {2013-03-14 10:05:39 +0100}, - Hyphenation = {american}, - Location = {Reading, Mass.}, - Maintitle = {Computers \& Typesetting}, - Publisher = {Addison-Wesley}, - Sorttitle = {Computers & Typesetting E}, - Sortyear = {1986-4}, - Title = {Computer Modern Typefaces}, - Volume = {E}} - -@online{wassenhoven:dw, - Author = {Dominik Waßenhoven}, - Date = {2011}, - Date-Added = {2013-03-13 21:58:04 +0100}, - Date-Modified = {2013-03-13 22:05:36 +0100}, - Keywords = {primaria}, - Title = {\texttt{biblatex-dw}}, - Url = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-dw}, - Version = {1.4}, - Annote = {A small collection of styles for the biblatex pack- age. It was designed for citations in the Humanities and offers some features that are not provided by the standard biblatex styles.}, - Bdsk-Url-1 = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-dw}} - -@book{popper-logik:ing, - Author = {Karl R. Popper}, - Booktitle = {The Logic of Scientific Discovery}, - Date = {1959}, - Date-Added = {2013-03-01 17:55:40 +0100}, - Date-Modified = {2014-03-26 08:57:48 +0000}, - Edition = {3}, - Keywords = {primaria,popper}, - Location = {London}, - Owner = {Alex Arcozzi}, - Publisher = {Hutchinson}, - Related = {popper-logik:ita}, - Relatedstring = {it. trans.}, - Timestamp = {2012.04.25}, - Title = {The Logic of Scientific Discovery}} - -@book{popper-logik:ita, - Author = {Karl R. Popper}, - Date = {1998}, - Date-Added = {2013-03-01 17:50:46 +0100}, - Date-Modified = {2014-03-26 08:55:40 +0000}, - Edition = {3}, - Keywords = {primaria,popper}, - Location = {Torino}, - Owner = {Alex Arcozzi}, - Publisher = {Einaudi}, - Timestamp = {2012.04.25}, - Title = {Logica della scoperta scientifica}} - -@book{popper-logik, - Author = {Karl R. Popper}, - Booktitle = {Logik der Forschung}, - Date = {1934}, - Date-Added = {2013-03-01 17:50:26 +0100}, - Date-Modified = {2014-03-26 08:59:02 +0000}, - Keywords = {esempio}, - Location = {Wien}, - Owner = {Alex Arcozzi}, - Publisher = {Springer}, - Related = {popper-logik:ing}, - Relatedstring = {engl. trans.}, - Timestamp = {2012.04.25}, - Title = {Logik der Forschung}, - Annote = {A book entry followed by two differents translations, cross-referenced in the \texttt{related} (biber 1.6 or later required)}} - -@bookinbook{kant:ku:xref, - Author = {Kant, Immanuel}, - Date = {1968}, - Date-Added = {2013-02-28 09:42:34 +0100}, - Date-Modified = {2013-03-15 19:27:38 +0100}, - Hyphenation = {german}, - Keywords = {esempio}, - Pages = {165-485}, - Title = {Kritik der Urtheilskraft}, - Volume = {5}, - Xref = {kant:werke}} - -@bookinbook{kant:kpv, - Annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the \emph{Critique of Practical Reason} only, not to the entire fifth volume. Note the \texttt{author} and \texttt{bookauthor} fields in the database file. By default, the \texttt{bookauthor} is omitted if the values of the \texttt{author} and \texttt{bookauthor} fields are identical}, - Author = {Kant, Immanuel}, - Bookauthor = {Kant, Immanuel}, - Booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, - Date = {1968}, - Date-Added = {2013-02-28 09:42:31 +0100}, - Date-Modified = {2013-03-13 22:56:41 +0100}, - Hyphenation = {german}, - Keywords = {esempio}, - Location = {Berlin}, - Maintitle = {Kants Werke. Akademie Textausgabe}, - Pages = {1--163}, - Publisher = {Walter de Gruyter}, - Shorthand = {KpV}, - Shorttitle = {Kritik der praktischen Vernunft}, - Title = {Kritik der praktischen Vernunft}, - Volume = {5}} - -@bookinbook{kant:kpv:xref, - Author = {Kant, Immanuel}, - Date = {1968}, - Date-Added = {2013-02-25 22:44:19 +0100}, - Date-Modified = {2013-03-15 19:27:33 +0100}, - Keywords = {esempio}, - Pages = {1-163}, - Shorttitle = {Kritik der praktischen Vernunft}, - Title = {Kritik der praktischen Vernunft}, - Volume = {5}, - Xref = {kant:werke}} - -@bookinbook{kant:ku, - Annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an \texttt{inbook} entry which explicitly refers to the \emph{Critique of Judgment} only, not to the entire fifth volume}, - Author = {Kant, Immanuel}, - Bookauthor = {Kant, Immanuel}, - Booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, - Date = {1968}, - Date-Added = {2013-02-25 22:44:19 +0100}, - Date-Modified = {2013-03-13 22:57:07 +0100}, - Hyphenation = {german}, - Keywords = {esempio}, - Location = {Berlin}, - Maintitle = {Kants Werke. Akademie Textausgabe}, - Pages = {165--485}, - Publisher = {Walter de Gruyter}, - Shorthand = {KU}, - Title = {Kritik der Urtheilskraft}, - Volume = {5}} - -@mvbook{descartes:oeuvres, - Author = {René Descartes}, - Date = {1897/}, - Date-Added = {2013-02-25 22:44:19 +0100}, - Date-Modified = {2013-03-15 16:36:58 +0100}, - Editor = {Charles Adam and Paul Tannery}, - Hyphenation = {french}, - Keywords = {esempio}, - Location = {Paris}, - Title = {Oeuvres complètes}, - Volumes = {13}, - Annote = {A critical multivolume edition}} - -@online{guit:sito, - Date = {2012}, - Date-Added = {2012-04-21 16:52:51 +0200}, - Date-Modified = {2013-03-15 16:40:18 +0100}, - Hyphenation = {italian}, - Keywords = {esempio, web}, - Title = {GuIT. Gruppo degli Utilizzatori Italiani di \TeX}, - Url = {http://www.guitex.org}, - Urldate = {2012-01-15}, - Annote = {A Web site}, - Bdsk-Url-1 = {http://www.guitex.org}} - -@book{Bringhurst:1992, - Author = {Robert Bringhurst}, - Booktitle = {The Elements of Typographic Style}, - Date = {1991}, - Date-Added = {2012-04-19 20:54:38 +0200}, - Date-Modified = {2013-03-13 22:30:27 +0000}, - Keywords = {esempio}, - Location = {Vancouver, Canada}, - Publisher = {Hartley \& Marks Publisher Inc.}, - Title = {The Elements of Typographic Style}} - -@mvbook{comenio:oo, - Author = {Jan Amos Komensky}, - Booktitle = {Opera Omnia}, - Date = {1969}, - Date-Added = {2012-04-19 20:20:03 +0200}, - Date-Modified = {2013-03-15 16:32:24 +0100}, - Keywords = {esempio}, - Location = {Praga}, - Nameaddon = {Comenio}, - Title = {Opera Omnia}, - Annote = {This author is known with his Latin name, given in the \texttt{nameaddon} field}} - -@online{clawson:mla, - Author = {James Clawson}, - Date = {2010}, - Date-Added = {2012-04-18 11:51:47 +0200}, - Date-Modified = {2013-03-13 22:02:08 +0100}, - Keywords = {primaria}, - Subtitle = {MLA Style Using biblatex}, - Title = {\texttt{biblatex-mla}}, - Url = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-mla}, - Version = {0.95}, - Annote = {The biblatex-mla files provide support to biblatex, bibtex, and latex for citations and Works Cited lists in the style established by the Modern Language Association (MLA)}, - Bdsk-Url-1 = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-mla}} - -@online{glibof:historian, - Author = {Sander Gliboff}, - Date = {2010}, - Date-Added = {2012-04-18 11:49:37 +0200}, - Date-Modified = {2013-03-13 23:38:14 +0100}, - Hyphenation = {english}, - Keywords = {primaria}, - Subtitle = {A Footnotes-and-Bibliography Style, Following Turabian/Chicago Guidelines: For Use with the Biblatex System of Programmable Bibliographies and Citations}, - Title = {User's Guide to \texttt{Historian}}, - Url = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-historian}, - Version = {0.4}, - Annote = {Historian follows the conventions of The Chicago Manual of Style, as presented in Turabian’s Manual for Writers}, - Bdsk-Url-1 = {http://tug.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-historian}} - -@book{eco:2004, - Author = {Umberto Eco}, - Booktitle = {La ricerca della lingua perfetta nella cultura europea}, - Date = {2004}, - Date-Added = {2012-04-17 23:58:31 +0200}, - Date-Modified = {2012-04-21 14:58:15 +0000}, - Edition = {4}, - Hyphenation = {italian}, - Keywords = {primaria}, - Location = {Roma-Bari}, - Publisher = {Laterza}, - Shorttitle = {La ricerca della lingua perfetta}, - Title = {La ricerca della lingua perfetta nella cultura europea}} - -@book{guzman:sd, - Addendum = {Con los auspicios del Centro internacional de Investigacíones para el Desarrollo de Canada}, - Author = {Guzmán de Rojas, Iván}, - Date-Added = {2012-04-17 23:48:05 +0200}, - Date-Modified = {2013-04-01 00:43:20 +0200}, - Keywords = {esempio}, - Note = {mimeo}, - Shorttitle = {Problemática}, - Title = {Problemática logico-lingüística de la comunicacíon social con el pueblo Aymara}, - Annote = {A work without a pubblication date. The string \texttt{nodate} (localized) is automatically printed}} - -@book{heidegger:sz, - Author = {Martin Heidegger}, - Booktitle = {Sein und Zeit}, - Date = {2001}, - Date-Added = {2012-04-15 18:03:59 +0200}, - Date-Modified = {2013-03-15 16:41:30 +0100}, - Edition = {18}, - Keywords = {esempio,volumesingolo}, - Library = {Apparso originariamente nel 1927 nell'annuario diretto da H. Husserl \emph{Jahrbuch für Philosophie und phänomenologische Forschung (vol. VIII)}}, - Location = {Tübingen}, - Publisher = {Max Niemeyer Verlag}, - Title = {Sein und Zeit}, - Annote = {Note the \texttt{library} field, use for some details about the first edition}} - -@incollection{berto:sep-impossible-worlds, - Author = {Berto, Francesco}, - Booktitle = {The Stanford Encyclopedia of Philosophy}, - Date = {2009}, - Date-Modified = {2013-03-15 16:29:59 +0100}, - Edition = {Fall 2009}, - Editor = {Edward N. Zalta}, - Keywords = {esempio}, - Title = {Impossible Worlds}, - Url = {http://plato.stanford.edu/archives/fall2009/entries/impossible-worlds/}, - Annote = {An article published in a online ecnyclopedia.}, - Bdsk-Url-1 = {http://plato.stanford.edu/archives/fall2009/entries/impossible-worlds/}} - -@online{ctan, - Date = {2006}, - Date-Added = {2011-06-02 17:33:32 +0200}, - Date-Modified = {2013-03-15 16:35:26 +0100}, - Hyphenation = {american}, - Keywords = {esempio, web}, - Label = {CTAN}, - Subtitle = {The Comprehensive TeX Archive Network}, - Title = {CTAN}, - Url = {http://www.ctan.org}, - Urldate = {2006-10-01}, - Annote = {Note the \texttt{urldate} field and the \texttt{label} field, used for the citations.}, - Bdsk-Url-1 = {http://www.ctan.org}} - -@inbook{Spencer:1891b, - Booktitle = {Scientific, Political, \& Speculative}, - Crossref = {Spencer:1891vol2}, - Pages = {74-144}, - Title = {The Classification of the Sciences}, - Volume = {2}} - -@bookinbook{Spencer:1891vol2, - Author = {Herbert Spencer}, - Date = {1891}, - Keywords = {esempio}, - Location = {Edinburgh}, - Maintitle = {Essays}, - Publisher = {Williams {and} Norgate}, - Title = {Scientific, Political, \& Speculative}, - Volume = {2}} - -@mvbook{Spencer:1891, - Author = {Herbert Spencer}, - Date = {1891}, - Date-Modified = {2013-03-15 16:53:06 +0100}, - Keywords = {esempio}, - Location = {Edinburgh}, - Publisher = {Williams {and} Norgate}, - Title = {Essays}, - Volumes = {3}, - Annote = {A multivolume work}} - -@book{Frege, - Address = {Hamburg}, - Author = {Frege, Gottlob}, - Date = {1988}, - Date-Modified = {2013-03-15 16:40:09 +0100}, - Keywords = {esempio}, - Pagination = {line}, - Publisher = {Meiner}, - Subtitle = {Eine logisch mathematische Untersuchung über den Begriff der Zahl}, - Title = {Die Grundlagen der Arithmetik}, - Annote = {Note the \texttt{pagination} field, used to change the string preceding the \texttt{postnote} argument of the citation commands}} - -@bookinbook{Reale1987, - Address = {Milano}, - Author = {Giovanni Reale}, - Date = {1987}, - Date-Modified = {2013-03-15 16:48:31 +0100}, - Edition = {5}, - Hyphenation = {italian}, - Keywords = {esempio}, - Maintitle = {Storia della filosofia antica}, - Pages = {458-493}, - Publisher = {Vita e Pensiero}, - Title = {Dalle origini a Socrate}, - Titleaddon = {Appendice seconda: ``Precisazioni sulle caratteristiche fondamentali del concetto greco di filosofia''}, - Volume = {1}, - Annote = {A book published in a multivolume work. Note the \texttt{titleaddon} field, used for the details about the chapter title}} - -@reference{SEP, - Booktitle = {The Stanford Encyclopedia of Philosophy}, - Date = {2009}, - Date-Added = {2010-04-12 14:15:35 +0200}, - Date-Modified = {2010-04-12 16:35:03 +0200}, - Editor = {Zalta, Edward N.}, - Keywords = {esempio}, - Label = {SEP}, - Options = {useeditor=false}, - Sorttitle = {Stanford Encyclopedia of Philosophy}, - Title = {The Stanford Encyclopedia of Philosophy}, - Url = {http://plato.stanford.edu/}, - Bdsk-Url-1 = {http://plato.stanford.edu/}} - -@mvreference{britannica, - Booktitle = {The New Encyclopædia Britannica}, - Date = {2003}, - Date-Added = {2010-03-10 17:46:47 +0100}, - Date-Modified = {2013-03-15 16:31:11 +0100}, - Edition = {15}, - Editor = {Preece, Warren E.}, - Hyphenation = {british}, - Indextitle = {Encyclopædia Britannica, The New}, - Keywords = {esempio}, - Label = {EB}, - Location = {Chicago, Ill.}, - Options = {useeditor=false}, - Publisher = {Encyclopædia Britannica}, - Shorttitle = {Encyclopædia Britannica}, - Sorttitle = {Encyclopædia Britannica}, - Title = {The New Encyclopædia Britannica}, - Volumes = {32}, - Annote = {A multivolume encyclopedia. Note the \texttt{useeditor=false} option and \texttt{indextitle} field.}} - -@book{pantieri:artelatex, - Author = {Lorenzo Pantieri and Tommaso Gordini}, - Booktitle = {L'arte di scrivere con \LaTeX}, - Date = {2011}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-13 22:04:30 +0100}, - Foreword = {Enrico Gregorio}, - Hyphenation = {italian}, - Keywords = {primaria}, - Subtitle = {Un'introduzione a \LaTeX}, - Title = {L'arte di scrivere con \LaTeX}, - Url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf}, - Annote = {The most popular italian guide to \LaTeX. A little masterpiece of style and typesetting}, - Bdsk-Url-1 = {http://www.lorenzopantieri.net/}} - -@article{Moore:1903:ORIGFIELDS, - Author = {George Edward Moore}, - Date = {1903}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-15 16:43:29 +0100}, - Hyphenation = {english}, - Journaltitle = {Mind}, - Keywords = {esempio}, - Month = {5}, - Number = {12}, - Origdate = {1969}, - Origlocation = {Torino}, - Origpublisher = {UTET}, - Origtitle = {La confutazione dell'idealismo}, - Pages = {433-453}, - Series = {N.S.}, - Title = {The refutation of idealism}, - Usera = {Il Neoempirismo}, - Userb = {a cura di Alberto Pasquinelli}, - Userc = {35-61}, - Annote = {An entry typeset using the depreciated \texttt{orig-} fields mechanism}} - -@incollection{federspil:2009, - Author = {Giovanni Federspil and Roberto Vettor}, - Crossref = {Filmed:2009}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-15 16:37:35 +0100}, - Hyphenation = {italian}, - Keywords = {esempio}, - Pages = {43-74}, - Title = {Medicina: un unico metodo e una sola argomentazione?}, - Annote = {An \texttt{@incollection} entry. The \texttt{@collection} is automatically printed in the bibliography because another \texttt{@incollection} has been cited}} - -@bookinbook{descartes:discours, - Author = {René Descartes}, - Date = {1897/1913}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-15 16:36:37 +0100}, - Editor = {Charles Adam and Paul Tannery}, - Keywords = {esempio}, - Location = {Paris}, - Maintitle = {Ouvres de Descartes}, - Pages = {1-78}, - Title = {Discours de la méthode}, - Volume = {6}, - Volumes = {12}, - Annote = {A book published in a multivolume critical edition}} - -@incollection{corrocher:2009, - Author = {Roberto Corrocher}, - Crossref = {Filmed:2009}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-15 16:33:22 +0100}, - Hyphenation = {italian}, - Keywords = {esempio}, - Pages = {27-42}, - Read = {0}, - Title = {Riflessioni sull'uomo di fronte a nuove sfide}, - Annote = {An \texttt{@incollection} entry. The \texttt{@collection} is automatically printed in the bibliography because another \texttt{@incollection} has been cited}} - -@book{Poincare:1968-ORIG, - Author = {Jules-Henri Poincaré}, - Booktitle = {La science et l'hypothèse}, - Date = {1968}, - Date-Added = {2010-03-05 16:18:11 +0100}, - Date-Modified = {2013-03-15 19:07:49 +0100}, - Keywords = {esempio}, - Location = {Paris}, - Publisher = {Flammarion}, - Related = {Poincare:1968-ITA}, - Title = {La science et l'hypothèse}, - Annote = {A book entry followed by its translation, cross-referenced in the \texttt{related} field}} - -@book{Poincare:1968-ITA, - Author = {Jules-Henri Poincaré}, - Booktitle = {La science et l'hypothèse}, - Date = {2003}, - Date-Modified = {2013-03-15 19:07:03 +0100}, - Editor = {Corrado Sinigaglia}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Milano}, - Note = {testo greco a fronte}, - Publisher = {Bompiani}, - Title = {La scienza e l'ipotesi}} - -@incollection{Degani:2009, - Author = {Marta Degani and Elisabetta Adami and Anna Belladelli}, - Crossref = {Facchinetti:2009}, - Date-Added = {2009-12-15 16:50:20 +0100}, - Date-Modified = {2009-12-18 18:10:12 +0100}, - Keywords = {esempio}, - Pages = {13-54}, - Title = {The Use of Modal Verbs in Interpersonal Contexts: From Semantics to Pragmatics}} - -@incollection{Facchinetti:2009a, - Author = {Roberta Facchinetti}, - Crossref = {Facchinetti:2009}, - Date-Added = {2009-12-15 16:47:44 +0100}, - Date-Modified = {2012-04-15 17:05:04 +0200}, - Keywords = {esempio}, - Note = {Note}, - Pages = {35-44}, - Title = {Subjectivity, (non-)subjectivity and intersubjectivity}, - Volume = {3}} - -@collection{Facchinetti:2009, - Booktitle = {Studies on English Modality}, - Date = {2009}, - Date-Added = {2009-12-15 16:13:17 +0100}, - Date-Modified = {2012-04-15 17:02:57 +0200}, - Editor = {Anastasios Tsangalidis and Roberta Facchinetti}, - Keywords = {esempio}, - Location = {Bern}, - Publisher = {Peter Lang}, - Title = {Studies on English Modality}} - -@incollection{Termini:2007, - Author = {Settimo Termini}, - Crossref = {Bartocci:2007}, - Date-Added = {2009-10-22 14:36:21 +0200}, - Date-Modified = {2013-03-15 16:53:58 +0100}, - Hyphenation = {italian}, - Keywords = {esempio}, - Title = {Vita morte e miracoli di Alan Mathison Turing}} - -@online{lehman:biblatex, - Author = {Philipp Lehman}, - Booktitle = {The \textsf{biblatex} package}, - Date = {2011}, - Date-Added = {2009-10-13 18:52:07 +0200}, - Date-Modified = {2013-03-13 23:38:26 +0100}, - Hyphenation = {english}, - Keywords = {primaria}, - Subtitle = {Programmable Bibliographies and Citations}, - Title = {The \texttt{biblatex} package}, - Url = {http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/doc/}, - Version = {\\1.7}, - Annote = {This document is a systematic reference manual for the \texttt{biblatex} package. Look at the sample documents which ship with \texttt{biblatex} to get a first impression.}, - Bdsk-Url-1 = {http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/doc/}} - -@article{Mori:2008, - Author = {Lapo F. Mori}, - Date = {2008}, - Date-Added = {2009-10-13 13:50:34 +0200}, - Date-Modified = {2013-03-15 16:43:37 +0100}, - Hyphenation = {italian}, - Journaltitle = {ArsTeXnica}, - Keywords = {primaria}, - Month = {10}, - Number = {6}, - Pages = {37-51}, - Title = {Gestire la bibliografia con \LaTeX}, - Annote = {An article entry}} - -@incollection{Rossitto:1977, - Author = {Cristina Rossitto}, - Crossref = {Berti:1977}, - Date-Added = {2009-09-29 11:29:32 +0200}, - Date-Modified = {2013-03-15 16:49:38 +0100}, - Hyphenation = {italian}, - Keywords = {esempio}, - Pages = {43-69}, - Title = {Opposizione e non contraddizione nella \emph{Metafisica} di Aristotele}, - Annote = {Note that the \texttt{@collection} data (inherited from the \texttt{crossref} field) are printed inside the \texttt{@incollection} entry because this is the the only \texttt{@incollection} cited from that \texttt{@collection} -}} - -@incollection{Valbusa:2007, - Author = {Ivan Valbusa}, - Booktitle = {Christian Wolff tra psicologia empirica e psicologia razionale}, - Date = {2007}, - Date-Added = {2009-09-27 23:17:07 +0200}, - Date-Modified = {2009-10-13 13:16:37 +0200}, - Editor = {Ferdinando Luigi Marcolungo}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Hildesheim and Zürich and London}, - Publisher = {Georg Olms Verlag}, - Title = {Psicologia e sistema in Alsted e in Wolff}} - -@collection{Pasquinelli:1969, - Booktitle = {Il Neoempirismo}, - Date = {1969}, - Date-Added = {2009-09-27 01:21:58 +0200}, - Date-Modified = {2013-03-15 16:44:07 +0100}, - Editor = {Alberto Pasquinelli}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Torino}, - Publisher = {UTET}, - Title = {Il Neoempirismo}} - -@collection{Berti:1977, - Booktitle = {La contraddizione}, - Date = {1977}, - Date-Added = {2009-09-30 19:34:48 +0200}, - Date-Modified = {2013-03-15 16:29:45 +0100}, - Editor = {Enrico Berti}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Roma}, - Publisher = {Città Nuova}, - Title = {La contraddizione}, - Annote = {A collection with one author}} - -@collection{Bartocci:2007, - Booksubtitle = {Protagonisti del '900 da Hilbert a Wiles}, - Booktitle = {Vite matematiche}, - Date = {2007}, - Date-Added = {2009-10-20 17:17:52 +0200}, - Date-Modified = {2013-03-15 16:29:20 +0100}, - Editor = {Claudio Bartocci and Renato Betti and Angelo Guerraggio and Roberto Lucchetti}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Milano}, - Publisher = {Springer-Verlag Italia}, - Title = {Vite matematiche}, - Annote = {A collection with four authors.}} - -@collection{Filmed:2009, - Booktitle = {Filosofia delle medicina}, - Date = {2009}, - Date-Added = {2009-09-27 23:05:08 +0200}, - Date-Modified = {2013-03-15 16:37:44 +0100}, - Editor = {Pierdaniele Giaretta and Antonio Moretto and Gian Franco Gensini and Marco Trabucchi}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Bologna}, - Publisher = {il Mulino}, - Subtitle = {Metodo, modelli, cura ed errori}, - Title = {Filosofia delle medicina}, - Volumes = {2}, - Annote = {A collection with four editors. The list is automatically truncated in the citations -}} - -@collection{mate_einaudi:2007, - Booktitle = {La matematica}, - Date = {2007/2011}, - Date-Added = {2012-04-15 17:10:54 +0200}, - Date-Modified = {2013-03-13 23:30:00 +0100}, - Editor = {Claudio Bartocci and Piergiorgio Odifreddi}, - Hyphenation = {italian}, - Keywords = {esempio}, - Location = {Torino}, - Publisher = {Einaudi}, - Title = {La matematica}, - Volumes = {4}} - -@mvbook{kant:werke, - Author = {Kant, Immanuel}, - Booktitle = {Kants Werke. Akademie Textausgabe}, - Date = {1968}, - Date-Added = {2010-03-06 00:26:39 +0100}, - Date-Modified = {2013-03-15 14:01:45 +0100}, - Hyphenation = {german}, - Keywords = {esempio, modern}, - Location = {Berlin}, - Maintitle = {Kants Werke. Akademie Textausgabe}, - Publisher = {Walter de Gruyter}, - Shorthand = {KW}, - Title = {Kants Werke. Akademie Textausgabe}, - Volumes = {9}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-philosophy/test-modern.tex new/doc/latex/biblatex-philosophy/test-modern.tex --- old/doc/latex/biblatex-philosophy/test-modern.tex 2016-05-18 23:59:03.000000000 +0200 +++ new/doc/latex/biblatex-philosophy/test-modern.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -% !TEX encoding = UTF-8 Unicode -% !TEX TS-program = pdflatex -% !BIB TS-program = biber -\documentclass{article} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} - -\usepackage[style=italian]{csquotes} -\usepackage[% -backend=biber, -style=philosophy-modern, -annotation=true, -hyperref, -backref]{biblatex} -\addbibresource{philosophy-examples.bib} - -\usepackage{hyperref} - -\newcommand{\cmd}[1]{\texttt{\textbackslash #1}} - -\begin{document} - -\textbf{N.B.} For other examples see \texttt{philosophy-examples.bib} and \texttt{biblatex-examples.bib} files. - -\section{Standard commands} - -\begin{description} -\item[\cmd{cite\{eco:2004\}}] \cite{eco:2004}\\ -\item[\cmd{textcite\{eco:2004\}}] \textcite{eco:2004}\\ -\item[\cmd{parencite\{eco:2004\}}] \parencite{eco:2004}\\ -\item[\cmd{autocite\{eco:2004\}}]\autocite{eco:2004} -\end{description} - -\section{Special commands} - -\subsection{\cmd{sdcite\{key\}}} - -This command is deprecated. Use the \texttt{entrysubtype} mechanism instead: \cite{aristotle:physics} (see documentation for details). - -\begin{description} -\item[\cmd{sdcite\{guzman:sd\}}] \sdcite{guzman:sd} -\end{description} - -\subsection{\cmd{footcitet}} - -Typeset a footnote using the same style of \cmd{textcite}.\footcitet[12-13]{eco:2004} Compare with this one.\footcite[12-13]{eco:2004} - -\section{Some miscellaneous citations} - -\textcite{Agati1991,Alpers1991,Mori:2008,comenio:oo,eco:2004,heidegger:sz,pantieri:artelatex,Poincare:1968-ORIG,popper-logik,descartes:discours,kant:kpv:xref,kant:ku:xref,Spencer:1891vol2,guzman:sd,Berti:1977,Spencer:1891b,berto:sep-impossible-worlds,corrocher:2009,federspil:2009,Valbusa:2007,britannica,ctan,guit:sito,SEP} - -\printbibliography - -\printbibliography[restoreclassic,type=book] - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-philosophy/test-verbose.tex new/doc/latex/biblatex-philosophy/test-verbose.tex --- old/doc/latex/biblatex-philosophy/test-verbose.tex 2016-05-18 23:59:03.000000000 +0200 +++ new/doc/latex/biblatex-philosophy/test-verbose.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -% !TEX TS-program = pdfLaTeX -% !TEX encoding = UTF-8 Unicode -% !BIB TS-program = biber -\documentclass[12pt,a4paper,twoside,openright,titlepage]{book} -\usepackage[norules,swapnames]{frontespizio} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\usepackage[english,italian]{babel} -\usepackage[style=italian]{csquotes} -\usepackage[style=philosophy-verbose,scauthors=true,scauthorscite=true,indexing=cite,backend=biber]{biblatex} - \addbibresource{Bibliografia.bib} -\usepackage{indentfirst} -\usepackage[a4paper,top=2.5cm,bottom=2.5cm,left=3cm,right=3cm,bindingoffset=5mm]{geometry} -\usepackage{url} -\usepackage{hyperref} -\usepackage{setspace} -\usepackage{blindtext} -\usepackage{epigraph} -\usepackage{emptypage} -\usepackage{makeidx} -\renewcommand{\textflush}{flushepinormal} - -\DeclareIndexFieldFormat{indextitle}{}{}{} - -\defbibheading{primaria}{\subsection*{Bibliografia Primaria}} -\defbibheading{secondaria}{\subsection*{Bibliografia Secondaria}} - -\makeindex -\onehalfspacing - -\addbibresource{philosophy-examples.bib}% - - -\begin{document} - -\section{Test file for \texttt{philosophy-verbose}} - -This is the first citation of an entry.\footcite{eco:2004}. This is another citation of the same work, with an explicit page number.\footcite[26]{eco:2004} And now a citation of the same place.\footcite[26]{eco:2004} - -Now we cite another entry for the first time (all data are printed).\footcite{Frege}. Finally we cite the first work, which will be shortened.\footcite[67]{eco:2004} - - -\printbibliography - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-philosophy.doc.tlpobj new/tlpkg/tlpobj/biblatex-philosophy.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-philosophy.doc.tlpobj 2016-05-19 17:30:53.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-philosophy.doc.tlpobj 2017-04-17 16:23:08.000000000 +0200 @@ -1,12 +1,9 @@ name biblatex-philosophy.doc category Package -revision 41245 +revision 43860 shortdesc doc files of biblatex-philosophy relocated 1 -docfiles size=203 +docfiles size=218 RELOC/doc/latex/biblatex-philosophy/README RELOC/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf RELOC/doc/latex/biblatex-philosophy/examples.zip - RELOC/doc/latex/biblatex-philosophy/philosophy-examples.bib - RELOC/doc/latex/biblatex-philosophy/test-modern.tex - RELOC/doc/latex/biblatex-philosophy/test-verbose.tex ++++++ biblatex-philosophy.tar.xz ++++++ ++++ 4283 lines of diff (skipped) ++++++ biblatex-phys.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-phys/biblatex-phys-blx.bib new/doc/latex/biblatex-phys/biblatex-phys-blx.bib --- old/doc/latex/biblatex-phys/biblatex-phys-blx.bib 2016-03-13 22:18:52.000000000 +0100 +++ new/doc/latex/biblatex-phys/biblatex-phys-blx.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -@Comment{$ biblatex control file $} -@Comment{$ biblatex version 2.6 $} -Do not modify this file! - -This is an auxiliary file used by the 'biblatex' package. -This file may safely be deleted. It will be recreated as -required. - -@Control{biblatex-control, - options = {2.6:0:0:1:0:0:1:1:0:0:0:0:0:1:2:1:79:+}, -} Binary files old/doc/latex/biblatex-phys/biblatex-phys.pdf and new/doc/latex/biblatex-phys/biblatex-phys.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-phys/biblatex-phys.tex new/doc/latex/biblatex-phys/biblatex-phys.tex --- old/doc/latex/biblatex-phys/biblatex-phys.tex 2016-03-13 22:18:52.000000000 +0100 +++ new/doc/latex/biblatex-phys/biblatex-phys.tex 2016-11-25 19:28:16.000000000 +0100 @@ -25,8 +25,8 @@ {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{\pkg{biblatex-phys} -- A \pkg{biblatex} implementation of the \textsc{aip} and \textsc{aps} bibliography style% - \footnote{This file describes v1.0a, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.0b, last revised 2016/08/23.}} +\date{Released 2016/08/23} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -180,6 +180,7 @@ formatting} \changes{v1.0}{2016/03/10}{First stable release} \changes{v1.0a}{2016/03/13}{Ensure style works with both backends} +\changes{v1.0b}{2016/08/23}{Fix author list formatting issue} \PrintChanges diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-phys.doc.tlpobj new/tlpkg/tlpobj/biblatex-phys.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-phys.doc.tlpobj 2016-04-14 18:42:24.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-phys.doc.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,12 +1,11 @@ name biblatex-phys.doc category Package -revision 40017 +revision 41922 shortdesc doc files of biblatex-phys relocated 1 -docfiles size=110 +docfiles size=109 RELOC/doc/latex/biblatex-phys/LICENSE.md RELOC/doc/latex/biblatex-phys/README.md - RELOC/doc/latex/biblatex-phys/biblatex-phys-blx.bib RELOC/doc/latex/biblatex-phys/biblatex-phys.bib RELOC/doc/latex/biblatex-phys/biblatex-phys.pdf RELOC/doc/latex/biblatex-phys/biblatex-phys.tex ++++++ biblatex-phys.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-phys/phys.bbx new/tex/latex/biblatex-phys/phys.bbx --- old/tex/latex/biblatex-phys/phys.bbx 2016-03-13 22:18:52.000000000 +0100 +++ new/tex/latex/biblatex-phys/phys.bbx 2016-11-25 19:33:43.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{phys.bbx}[2016/03/13 v1.0a biblatex bibliography style] +\ProvidesFile{phys.bbx}[2016/08/23 v1.0b biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -54,23 +54,6 @@ url = false } -\@ifpackageloaded{biblatex_legacy} - {\renewbibmacro*{name:first-last}} - {\renewbibmacro*{name:given-family}} - [4]{% - \usebibmacro{name:delim}{#2#3#1}% - \usebibmacro{name:hook}{#2#3#1}% - \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\bibnamedelimd}% - \ifblank{#3}{}{% - \mkbibnameprefix{#3}\isdot - \ifpunctmark{'} - {} - {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}% - \mkbibnamelast{#1}\isdot - \ifblank{#4}{} - {\addcomma\space\mkbibnameaffix{#4}\isdot}% -} - % Custom field formats \DeclareFieldFormat[inproceedings]{booktitle}{#1} \DeclareFieldFormat{eprint:arxiv}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-phys/phys.cbx new/tex/latex/biblatex-phys/phys.cbx --- old/tex/latex/biblatex-phys/phys.cbx 2016-03-13 22:18:52.000000000 +0100 +++ new/tex/latex/biblatex-phys/phys.cbx 2016-11-25 19:33:43.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{phys.cbx}[2016/03/13 v1.0a biblatex citation style] +\ProvidesFile{phys.cbx}[2016/08/23 v1.0b biblatex citation style] \RequireCitationStyle{numeric-comp} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-phys.tlpobj new/tlpkg/tlpobj/biblatex-phys.tlpobj --- old/tlpkg/tlpobj/biblatex-phys.tlpobj 2016-04-14 18:42:24.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-phys.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-phys category Package -revision 40017 +revision 41922 shortdesc A BibLaTeX implementation of the AIP and APS bibliography style relocated 1 longdesc The biblatex-phys package provides an implementation of the @@ -15,7 +15,7 @@ RELOC/tex/latex/biblatex-phys/phys.bbx RELOC/tex/latex/biblatex-phys/phys.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-phys -catalogue-date 2016-03-13 13:18:51 +0100 +catalogue-date 2016-08-23 15:32:10 +0200 catalogue-license lppl1.3 catalogue-topics physics biblatex -catalogue-version 1.0a +catalogue-version 1.0b ++++++ biblatex-publist.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-publist/README new/doc/latex/biblatex-publist/README --- old/doc/latex/biblatex-publist/README 2016-05-16 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-publist/README 2017-04-12 23:08:34.000000000 +0200 @@ -18,9 +18,9 @@ The biblatex-publist package provides a biblatex bibliography style file (*.bbx) for publication lists, i.e. a bibliography containing one's own publications. The style file draws on -biblatex's authoryear style, but provides some extra features -needed for publication lists, such as the omission of the own -name from author or editor data. +biblatex's authoryear style per default (which can be changed), +but provides some extra features needed for publication lists, +such as the omission of the own name from author or editor data. The package requires at least version 3.4 of the biblatex package. @@ -45,6 +45,40 @@ == CHANGES == +* V. 1.7 (2017-04-12): + - Output marginyear before the author list. This prevents it from being vertically + shifted in case of long author lists. + +* V. 1.6 (2017-04-02): + - New option 'nameorder' that allows to change the ordering of author and editor + name ("given-family" vs. "family-given" [= default]). + - Use proper name delimiters also for bookauthor. + +* V. 1.5 (2017-02-28): + - Fix extra "and" in name list with plauthorhandling=highlight. + - Whitespace fix with plauthorhandling=highlight. + - Use proper name delimiters. + +* V. 1.4 (2017-02-12): + - New option 'plauthorhandling' that defines how the publist author is + handled in the publication list (possible values: "omit" [= default], + "highlight"). + - New command \plauthorhl that determines the aforementioned highlighting. + - Rename \omitname to \plauthorname (the old macro is still functional, + but marked as deprecated). + - Rename omit* options to plauthor* (the old options are still functional, + but marked as deprecated). + - Assure the margin text always starts uppercased (relevant for pubstates). + - Minor corrections to the manual. + +* V. 1.3 (2016-08-06): + - It is now possible to change the base style that is used. + - Proper sorting of pubstates. + - Add possibility to increase the indentation of items (by means + of the length extralabelnumberwidth). + - Use pagetracker=true instead of pagetracker=spread by default + (avoids warning, no change in functionality). + * V. 1.2 (2016-05-12): - Accomodate to the backwards-incompatible changes of biblatex 3.4 (prefixnumber > labelprefix, \ifempty > \ifdefvoid). Binary files old/doc/latex/biblatex-publist/biblatex-publist.pdf and new/doc/latex/biblatex-publist/biblatex-publist.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-publist/biblatex-publist.tex new/doc/latex/biblatex-publist/biblatex-publist.tex --- old/doc/latex/biblatex-publist/biblatex-publist.tex 2016-05-16 00:09:48.000000000 +0200 +++ new/doc/latex/biblatex-publist/biblatex-publist.tex 2017-04-12 23:08:34.000000000 +0200 @@ -79,16 +79,16 @@ \thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}% } -\date{Version 1.2, 2016/05/12} +\date{Version 1.7, 2017/04/12} \maketitle \begin{abstract} \noindent The \bpl\ package provides a \emph{biblatex bibliography style file} ({*}.bbx) for publication lists, i.\,e.\ a bibliography containing one's own -publications. The style file draws on \bibltx's \emph{authoryear} style, but -provides some extra features needed for publication lists, such as the omission -of the own name from author or editor data. The package requires at least version -3.4 of the \bibltx\ package\footnote{For \bibltx, see +publications. The style file draws on \bibltx's \emph{authoryear} style per default +(which can be changed), but provides some extra features needed for publication lists, +such as the omission or highlighting of the own name from\slash in author or editor data. +The package requires at least version 3.4 of the \bibltx\ package\footnote{For \bibltx, see \url{http://www.ctan.org/pkg/biblatex}.} and \texttt{biber} (the respective version as required by \bibltx). \end{abstract} @@ -100,7 +100,8 @@ author, usually sorted by genre and year. Even though publication lists are actually nothing else than (specific) bibliographies, they diverge from those in some respects. Most notably, it is widespread practice to omit your own name in -your publication list and only list your co-authors, if there are any. +your publication list and only list your co-authors, if there are any, or to +highlight your own name (e.\,g., with bold face letters). If you want to follow this practice, a normal bibliography style does not produce the desired result. @@ -122,17 +123,19 @@ The standard way of using the package is to load the style file via \begin{quote} -\begin{lstlisting}[language={[LaTeX]TeX},moretexcs={[1]{omitname}}] +\begin{lstlisting}[language={[LaTeX]TeX},moretexcs={[1]{plauthorname}}] \usepackage[bibstyle=publist]{biblatex} -\omitname[first name][von-part]{surname} +\plauthorname[first name][von-part]{surname} \end{lstlisting} \end{quote} -The \jcsmacro*{omitname} macro (at least with the mandatory -\emph{surname} argument) needs to be given once. It informs the style -file which name it should suppress in the author\slash editor list -(usually yours). That is to say: For all of your publications where -you are the sole author or editor, the author\slash editor name -will be omitted completely, as in: +The \jcsmacro*{plauthorname} macro\footnote{The macro was named \jfcsmacro{omitname} until v.\,1.4 +of the \bpl\ package. The old macro still works, but is marked as deprecated.} +(at least with the mandatory \emph{surname} argument) needs to be given once. +It informs the style file which name it should suppress or highlight in the +author\slash editor list (usually yours). + +With the default settings, the author\slash editor name will be omitted completely +for all of your publications where you are the sole author or editor, as in: \begin{quote} \textbf{2012.} Some recent trends in gardening. In: \emph{Gardening Practice} 56, pp.~34--86. @@ -143,23 +146,41 @@ \textbf{1987} (with John Doe and Mary Hall). Are there new trends in gardening? In: \emph{Gardening Practice} 24, pp.~10--15. \end{quote} +If \joption{plauthorhandling=highlight} is used (see next section), the plauthor +will be printed in bold face instead, as in: +\begin{quote} + Doe, John, \textbf{Myself, Me} and Hall, Mary, \textbf{1987}. Are there new trends + in gardening? In: \emph{Gardening Practice} 24, pp.~10--15. +\end{quote} -\subsection{Additional options} +\subsection{Additional options}\label{sec:addopts} Currently, the following additional options are provided (next to the options provided by the \bibltx\ package itself% \footnote{Please refer to the \bibltx\ manual \cite{bibltx} for those.}): \begin{description} -\item [{\joption{omitname}=<surname>}] -\item [{\joption{omitfirstname=<first name>}}] -\item [{\joption{omitnameprefix=<von-part>}}] ~ - -This is an alternative to the \jcsmacro{omitname} macro -described in sec.~\ref{sec:standard-usage}. However, due to the +\item [{\joption{plauthorname=<surname>}}] +\item [{\joption{plauthorfirstname=<first name>}}] +\item [{\joption{plauthornameprefix=<von-part>}}] ~ + +This is an alternative to the \jcsmacro{plauthorname} macro +described in sec.~\ref{sec:standard-usage}.\footnote{The options were called \jfoption{omitname}, \jfoption{omitfirstname} and \jfoption{omitnameprefix} until v.\,1.4 +of \bpl. The old options still work, but are marked as deprecated.} However, due to the way bibliography options are implemented in \bibltx, this only works if your name does not consist of non-ASCII characters. Hence, the -\jcsmacro{omitname} macro is the recommended way. +\jcsmacro{plauthorname} macro is the recommended way. + +\item [{\joption{plauthorhandling{[}=omit|highlight{]}}}] default: \emph{omit}. + +By default, the publist author (as defined with \jmacro{plauthor}) is omitted from +the author or editor list. If you use the option \joption{plauthorhandling=highlight}, +it is highlighted instead (i.\,e., set in bold face by default; see sec.~\ref{sec:auxmacros} how to change that). + +\item [{\joption{nameorder{[}=family-given|given-family{]}}}] default: \emph{family-given}. + +By default, the author and editor names with \joption{plauthorhandling=highlight} are output in the order ``Lastname, Given Names''. +To change the order to ``Given Names Lastname'', pass the option \joption{nameorder=given-family} to \bibltx. \item [{\joption{boldyear{[}=true|false{]}}}] default: \emph{true}. @@ -176,7 +197,9 @@ \end{description} -\noindent The appearance of the \emph{marginyear} is controlled by the +\subsection{Auxiliary macros and lengths}\label{sec:auxmacros} + +The appearance of the \emph{marginyear} is controlled by the \jcsmacro*{plmarginyear} macro, which has the following default definition: \begin{quote} \begin{lstlisting}[language={[LaTeX]TeX}, @@ -188,6 +211,44 @@ If you want to change the appearance, just redefine this macro via \jfcsmacro{renewcommand{*}}. +The highlighting of the publication list author, if \joption{plauthorhandling=highlight} has been set, +is controlled by the \jcsmacro*{plauthorhl} macro, which has the following default definition: +\begin{quote} + \begin{lstlisting}[language={[LaTeX]TeX}, + moretexcs={[2]{providecommand,plauthorhl,mkbibbold}}] +\providecommand*\plauthorhl[1]{% + \mkbibbold{#1}% +} +\end{lstlisting}\end{quote} +If you need another form of highlighting, redefine this macro via \jfcsmacro{renewcommand{*}}. + +The indendation of the bibliographic entries (lines > 1) can be adjusted by setting the length +\jmacro*{extralabel\-numberwidth} via \jfcsmacro{setlength} (default is \texttt{0pt}). +This might be needed for long bibliographies (> 99 entries) in order to adjust to the extra +space the item number needs. + + +\subsection{Using a different base style}\label{sec:basestyle} + +By default, \bpl\ loads \bibltx's \emph{authoryear} style, and it has been written +to work with that style. However, it is possible to try a diffent base style, if +\emph{author\-year} does not fit your needs.\condbreak{2\baselineskip} + +In order to do so, enter the following \emph{before} loading \bibltx: +\begin{quote} + \begin{lstlisting}[language={[LaTeX]TeX}, + moretexcs={[2]{publistbasestyle}}] + \newcommand*\publistbasestyle{<stylename>} + \end{lstlisting}\end{quote} +where <stylename> is the name of the biblatex bibliography style (\emph{bbx}) you want to use, without the \emph{bbx} entension (e.\,g., \lstinline|\newcommand*\publistbasestyle{mla}|). + +Note, though, that there is (and can be) no guarantee that \bpl\ will work with all styles, although it has been successfully tested with several. Be prepared to bump into \LaTeX\ errors and carefully check the output for correctness if you try a different base style. + +Note, further, that the order of author's and editor's given and family names is hardcoded in +\bpl\ due to the complex omission\slash highlighting mechanism. This might +differ from what you expect with specific base styles. To change the order, +use the package option \joption{nameorder} (see sec.~\ref{sec:addopts}). + \section{Localization} @@ -196,7 +257,7 @@ are added by the package: \begin{itemize} \item \emph{with}: the preposition ``with'' that precedes the list of -co-authors. +co-authors by default (i.\,e., with \joption{plauthorhandling=omit}). \item \emph{parttranslationof}: the expression ``partial translation of'' for entries referring to partially translated work via \bibltx's ``related entries'' feature (see sec.~\ref{sec:partial-translations}). @@ -248,14 +309,14 @@ frame=single, label={example}, language={[LaTeX]TeX}, - moretexcs={[4]{omitname,addbibresource,printbibliography,maketitle}}] + moretexcs={[5]{plauthorname,addbibresource,printbibliography,maketitle,newrefsection}}] \documentclass{article} \usepackage[T1]{fontenc} \usepackage[latin9]{inputenc} \usepackage{csquotes}% not required, but recommended -\usepackage[bibstyle=publist]{biblatex} -\omitname[John]{Doe} +\usepackage[style=publist]{biblatex} +\plauthorname[John]{Doe} \addbibresource{% mymonographs.bib, @@ -270,22 +331,19 @@ \maketitle \section{Monographs} -\begin{refsection}[mymonographs] +\newrefsection[mymonographs] \nocite{*} \printbibliography[heading=none] -\end{refsection} \section{Proceedings} -\begin{refsection}[myproceedings] +\newrefsection[myproceedings] \nocite{*} \printbibliography[heading=none] -\end{refsection} \section{Articles} -\begin{refsection}[myarticles] +\newrefsection[myarticles] \nocite{*} \printbibliography[heading=none] -\end{refsection} \end{document} \end{lstlisting} @@ -297,13 +355,12 @@ \begin{lstlisting}[caption={Adding foreign reviews}, frame=single, language={[LaTeX]TeX}, - moretexcs={[3]{bibfont,subsubsection,printbibliography}}] + moretexcs={[4]{bibfont,subsubsection,printbibliography,newrefsection}}] \subsubsection*{Reviews of my thesis} -\begin{refsection}[mythesis-reviews] +\newrefsection[mythesis-reviews] \renewcommand\bibfont{\small} \nocite{*} \printbibliography[heading=none,env=reviews] -\end{refsection} \end{lstlisting} \end{quote} @@ -322,10 +379,8 @@ frame=single, language={[LaTeX]TeX}, moretexcs={[1]{printbibliography}}] -\begin{refsection}[mybibliography] \nocite{*} \printbibliography[heading=none,filter=mine] -\end{refsection} \end{lstlisting} \end{quote} @@ -370,21 +425,60 @@ \end{lstlisting} \end{quote} - \section{Revision Log} \begin{description} -\item [{V.~1.2 (2016-05-12):}]~ + \item [{V.~1.7 (2017-04-12):}]~ + \begin{itemize} + \item Output marginyear before the author list. This prevents it from being vertically + shifted in case of long author lists. + \end{itemize} + + \item [{V.~1.6 (2017-04-02):}]~ + \begin{itemize} + \item New option \joption{nameorder} that allows to change the ordering of author and editor + name (\joption{given-family} vs. \joption{family-given} [=~default]). + \item Use proper name delimiters also for bookauthor. + \end{itemize} + + \item [{V.~1.5 (2017-02-28):}]~ + \begin{itemize} + \item Fix extra \emph{and} in name list with \joption{plauthorhandling=highlight}. + \item Whitespace fix with \joption{plauthorhandling=highlight}. + \item Use proper name delimiters. + \end{itemize} +\clearpage +\item [{V.~1.4 (2017-02-12):}]~ + \begin{itemize} + \item New option \joption{plauthorhandling} that defines how the publist author is + handled in the publication list (possible values: \joption{omit} [=~default], + \joption{highlight}). + \item New command \jcsmacro{plauthorhl} that determines the aforementioned highlighting. + \item Rename \jcsmacro{omitname} to \jcsmacro{plauthorname} (the old macro is still functional, but marked as deprecated). + \item Rename \joption{omit*} options to \joption{plauthor*} (the old options are still functional, but marked as deprecated). + \item Assure the margin text always starts uppercased (relevant for pubstates). + \item Minor corrections to the manual. + \end{itemize} + +\item [{V.~1.3 (2016-08-06):}]~ + +\begin{itemize} + \item It is now possible to change the base style that is used by \bpl. See sec.~\ref{sec:basestyle}. + \item Proper sorting of pubstates. + \item Add possibility to increase the indentation of items (by means of the length \jmacro{extralabelnumberwidth}). See sec.~\ref{sec:auxmacros}. + \item Use \jfoption{pagetracker=true} instead of \jfoption{pagetracker=spread} + by default (avoids warning, no change in functionality). +\end{itemize} +\item [{V.~1.2 (2016-05-12):}]~ \begin{itemize} - \item Accomodate to the backwards-incompatible changes of \bibltx~3.4 + \item Accomodate to the backwards-incompatible changes of \bibltx~3.4\\ (\jfoption{prefixnumber} $\Rightarrow$ \jfoption{labelprefix}, \jfcsmacro{ifempty} $\Rightarrow$ \jfcsmacro{ifdefvoid}). This version of \bibltx\ is now required. \end{itemize} \item [{V.~1.1 (2016-03-09):}]~ - \begin{itemize} \item Adapt to the \jfcsmacro{Declare*Name} changes of \bibltx~3.3. Since \bibltx~3.3 introduced backwards-incompatible changes that @@ -392,14 +486,12 @@ \end{itemize} \item [{V.~1.0~(2015-01-04):}]~ - \begin{itemize} \item Add portmanteau *.cbx file to allow loading \bpl\ also via the \jfoption{style} option (next to \jfoption{bibstyle}). \end{itemize} \item [{V.~0.9~(2014-03-13):}]~ - \begin{itemize} \item Fix problem with multi-token names. \item Support name prefix in \jcsmacro{omitname}. @@ -407,7 +499,6 @@ \end{itemize} \item [{V.~0.8~(2013-08-16):}]~ - \begin{itemize} \item Add custom sorting schemes \jmacro{ddnt}, \jmacro{ydmdnt} and \jmacro{dnt} (see sec.~\ref{sec:sorting}). @@ -415,23 +506,22 @@ \end{itemize}\condbreak{2\baselineskip} \item [{V.~0.7~(2013-07-25):}]~ - \begin{itemize} \item Support full dates. \end{itemize} -\item [{V.~0.6~(2013-07-21):}]~ +\item [{V.~0.6~(2013-07-21):}]~ \begin{itemize} \item Fix numbering with recent \bibltx\ versions. \end{itemize} -\item [{V.~0.5~(2013-05-03):}]~ +\item [{V.~0.5~(2013-05-03):}]~ \begin{itemize} \item Fix numbering if \jfcsmacro{printbibliography} is used multiple times within the same or without any \jfmacro{refsection}. \end{itemize} -\item [{V.~0.4~(2012-10-30):}]~ +\item [{V.~0.4~(2012-10-30):}]~ \begin{itemize} \item More robust name parsing (especially for names with non-ASCII characters encoded with \LaTeX{} macros). The code was kindly suggested by Enrico @@ -441,8 +531,8 @@ \item Add \jcsmacro{omitname} command (see sec.~\ref{sec:standard-usage}). \item Support \joption{firstinits} option. \end{itemize} -\item [{V.~0.3~(2012-10-23):}]~ +\item [{V.~0.3~(2012-10-23):}]~ \begin{itemize} \item Bug fix: Add missing ``and'' if omitted name was last minus one. \item Bug fix: Fix output with ``et al.'' if omitted name is first and @@ -452,6 +542,7 @@ \item Add French localization. \item Some corrections to the manual. \end{itemize} + \item [{V.~0.2~(2012-10-21):}] Initial release to CTAN. \end{description} @@ -467,11 +558,11 @@ \bibitem{bibltx}Lehman, Philipp (with Audrey Boruvka, Philip Kime and Joseph Wright): \emph{The biblatex Package. Programmable Bibliographies and Citations}. March 3, 2016. -\url{http://mirror.ctan.org/macros/latex/contrib/biblatex}. +\url{http://www.ctan.org/pkg/biblatex}. \bibitem{ttb}Markey, Nicolas: \emph{Tame the BeaST. The B to X of BibTEX}. October 11, 2009. -\url{http://mirror.ctan.org/info/bibtex/tamethebeast}. +\url{http://www.ctan.org/pkg/tamethebeast}. \end{thebibliography} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-publist.doc.tlpobj new/tlpkg/tlpobj/biblatex-publist.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-publist.doc.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-publist.doc.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-publist.doc category Package -revision 41160 +revision 43765 shortdesc doc files of biblatex-publist relocated 1 -docfiles size=78 +docfiles size=82 RELOC/doc/latex/biblatex-publist/README RELOC/doc/latex/biblatex-publist/biblatex-publist.pdf RELOC/doc/latex/biblatex-publist/biblatex-publist.tex ++++++ biblatex-publist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-publist/publist.bbx new/tex/latex/biblatex-publist/publist.bbx --- old/tex/latex/biblatex-publist/publist.bbx 2016-05-16 00:09:48.000000000 +0200 +++ new/tex/latex/biblatex-publist/publist.bbx 2017-04-12 23:08:34.000000000 +0200 @@ -25,8 +25,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl(a)version{1.2} -\def\bpl@rdate{2016/05/12} +\def\bpl(a)version{1.7} +\def\bpl@rdate{2017/04/12} \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space biblatex bibliography style (JSP)] @@ -40,16 +40,77 @@ This is a fatal error. I'm aborting now}% \endinput} -\RequireBibliographyStyle{authoryear} + +% +% Bibliography Options and Base Style +% + +% Deprecated Options (as of v. 1.4) +\DeclareBibliographyOption{omitname}{% + \PackageWarning{biblatex-publist}{The omitname option is deprecated!\MessageBreak + Please use plauthorname instead.}{}% + \def\bpl@osurname{#1}} +\DeclareBibliographyOption{omitfirstname}{% + \PackageWarning{biblatex-publist}{The omitfirstname option is deprecated!\MessageBreak + Please use plauthorfirstname instead.}{}% + \def\bpl@ofirstname{#1}} +\DeclareBibliographyOption{omitnameprefix}{% + \PackageWarning{biblatex-publist}{The omitnameprefix option is deprecated!\MessageBreak + Please use plauthornameprefix instead.}{}% + \def\bpl@ovonpart{#1}} + +% Valid options +\DeclareBibliographyOption{plauthorname}{\def\bpl@osurname{#1}} +\DeclareBibliographyOption{plauthorfirstname}{\def\bpl@ofirstname{#1}} +\DeclareBibliographyOption{plauthornameprefix}{\def\bpl@ovonpart{#1}} + +\newif\if@marginyear\@marginyearfalse +\DeclareBibliographyOption{marginyear}[true]{% + \ifstrequal{#1}{true}{\@marginyeartrue\reversemarginpar}{\@marginyearfalse} +} + +\newif\if@unboldyear\@unboldyearfalse +\DeclareBibliographyOption{boldyear}[true]{% + \ifstrequal{#1}{false}{\@unboldyeartrue}{\@unboldyearfalse} +} + +\newif\if@hlauthor\@hlauthorfalse +\DeclareBibliographyOption{plauthorhandling}[omit]{% + \ifstrequal{#1}{highlight}{\@hlauthortrue}{\@hlauthorfalse} +} + +\newif\if@givenfirst\@givenfirstfalse +\DeclareBibliographyOption{nameorder}[family-given]{% + \ifstrequal{#1}{given-family}{\@givenfirsttrue}{\@givenfirstfalse} +} + +% Check if users have defined different base styles +% If not, use authoryear. +\newif\ifbpl@standardbasestyle\bpl@standardbasestylefalse +\@ifundefined{publistbasestyle}{% + \newcommand*\publistbasestyle{authoryear} + \bpl@standardbasestyletrue}{} + +\RequireBibliographyStyle{\publistbasestyle} \ExecuteBibliographyOptions{% - pagetracker=spread, + pagetracker=true, labelnumber, useprefix=false, - dashed=false, sorting=ydnt, - defernumbers=true, - maxnames=4} + defernumbers=true} + +% Execute these options only with the standard base style +\ifbpl@standardbasestyle + \ExecuteBibliographyOptions{% + maxnames=4, + dashed=false} +\else + % This corresponds to bib option dashed=false + % (dashed option is not defined in every style) + \providebibmacro*{bbx:savehash}{}% + \renewbibmacro*{bbx:savehash}{}% +\fi % @@ -57,23 +118,23 @@ % % -% The omitted name of the publication list author +% The name of the publication list author \def\bpl@osurname{} \def\bpl@ofirstname{} \def\bpl@ovonpart{} % -% Manual way to specify omitted name -\def\omitname{% +% Manual way to specify publication list author name +\def\plauthorname{% \@ifnextchar[% - {\omitname@i} - {\omitname@i[]}% + {\plauthorname@i} + {\plauthorname@i[]}% } -\def\omitname@i[#1]{% +\def\plauthorname@i[#1]{% \@ifnextchar[% - {\omitname@ii{#1}} - {\omitname@ii{#1}[]}% + {\plauthorname@ii{#1}} + {\plauthorname@ii{#1}[]}% } -\def\omitname@ii#1[#2]#3{% +\def\plauthorname@ii#1[#2]#3{% % Do stuff \def\bpl@osurname{#3} \ifx\@empty#1\else\def\bpl@ofirstname{#1}\fi @@ -86,25 +147,10 @@ \raggedleft\small\textbf{#1}% } - -% -% Options % - -\DeclareBibliographyOption{omitname}{\def\bpl@osurname{#1}} - -\DeclareBibliographyOption{omitfirstname}{\def\bpl@ofirstname{#1}} - -\DeclareBibliographyOption{omitnameprefix}{\def\bpl@ovonpart{#1}} - -\newif\if@marginyear\@marginyearfalse -\DeclareBibliographyOption{marginyear}[true]{% - \ifstrequal{#1}{true}{\@marginyeartrue\reversemarginpar}{\@marginyearfalse} -} - -\newif\if@unboldyear\@unboldyearfalse -\DeclareBibliographyOption{boldyear}[true]{% - \ifstrequal{#1}{false}{\@unboldyeartrue}{\@unboldyearfalse} +% Highlighting auf publist author with plauthorhandling=highlight +\providecommand*\plauthorhl[1]{% + \mkbibbold{#1}% } @@ -127,8 +173,13 @@ \preto\blx@refsection{\global\setbool{newsection}{true}} +% Possibility to manually make the space occupied by the label wider +\newlength\extralabelnumberwidth +\setlength\extralabelnumberwidth{0pt} + \defbibenvironment{bibliography} - {\list + {\addtolength{\labelnumberwidth}{\extralabelnumberwidth}% + \list {\printtext[labelnumberwidth]{% \printfield{labelprefix}% \printfield{labelnumber}}} @@ -160,6 +211,7 @@ \newrobustcmd{\mkbibdesc}[1]{% \number\numexpr\csuse{bbx@itemtotal}+#1\relax} +% Way to manual shift the numbering (undocumented) \newcommand*\decreasebbxnumbering[1]{\csnumgdef{bbx@itemtotal}{\csuse{bbx@itemtotal}-#1}} @@ -244,14 +296,64 @@ \defbibfilter{mine}{category=filtered} - % -% Remove omitted name from author and editor lists +% Remove or embolden omitted name in author and editor lists % \newtoggle{myselfprec} \newtoggle{hadmyself} - +\newtoggle{ismyself} \DeclareNameFormat{author}{% + \if@hlauthor% + % Embolden omitted author + \bpl@normalize{\namepartfamily}{\bpl@tsurname}% + \bpl@normalize{\namepartgiven}{\bpl@tfirstname}% + \bpl@normalize{\namepartprefix}{\bpl@tvonpart}% + \bpl@normalize{\bpl@osurname}{\bpl@esurname}% + \bpl@normalize{\bpl@ofirstname}{\bpl@efirstname}% + \bpl@normalize{\bpl@ovonpart}{\bpl@evonpart}% + \ifboolexpr{ + test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} } + and + ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) + and + ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) } + {\toggletrue{ismyself}}{\togglefalse{ismyself}}% + \ifthenelse{\value{listcount}=1}{}{% + \ifnumless{\value{listcount}}{\value{liststop}}% + {\multinamedelim}% + {\finalnamedelim}% + }% + \iftoggle{ismyself}{\plauthorhl{% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi + }}{% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi + }% + \usebibmacro{name:andothers}% + \else% \if@hlauthor false \ifthenelse{\value{listcount}=1}{\ifthenelse{\value{author}>1}{\bibopenparen\bibstring{with}\addspace}{}}{}% % Exclude omitted author \bpl@normalize{\namepartfamily}{\bpl@tsurname}% @@ -276,12 +378,12 @@ test { \ifnumless{\value{listcount}}{3} } } {}{% \ifnumless{\value{listcount}}{\value{liststop}-1}% - {\addcomma\addspace}% + {\multinamedelim}% {\iftoggle{hadmyself}{% \ifnumless{\value{listcount}}{\value{liststop}}% - {\addcomma\addspace}% - {\addspace\bibstring{and}\addspace}} - {\addspace\bibstring{and}\addspace}}% + {\multinamedelim}% + {\finalnamedelim}} + {\finalnamedelim}}% }% }% \ifgiveninits @@ -292,9 +394,59 @@ \namepartfamily}% \usebibmacro{name:andothers}% \ifthenelse{\value{listcount}=\value{liststop}\AND\value{author}>1}{\unspace\bibcloseparen}{}% + \fi% end of \if@hlauthor else condition } \DeclareNameFormat{editor}{% + \if@hlauthor + % Embolden omitted editor + \bpl@normalize{\namepartfamily}{\bpl@tsurname}% + \bpl@normalize{\namepartgiven}{\bpl@tfirstname}% + \bpl@normalize{\bpl@osurname}{\bpl@esurname}% + \bpl@normalize{\bpl@ofirstname}{\bpl@efirstname}% + \ifboolexpr{ + test { \ifdefstrequal{\bpl@esurname}{\bpl@tsurname} } + and + ( test { \ifdefstrequal{\bpl@efirstname}{\bpl@tfirstname} } or test { \ifdefstring{\bpl@ofirstname}{} }) + and + ( test { \ifdefstrequal{\bpl@evonpart}{\bpl@tvonpart} } or test { \ifdefstring{\bpl@ovonpart}{} }) } + {\toggletrue{ismyself}}{\togglefalse{ismyself}} + \ifthenelse{\value{listcount}=1}{}{% + \ifnumless{\value{listcount}}{\value{liststop}-1}% + {\multinamedelim}% + {\finalnamedelim}% + }% + \iftoggle{ismyself}{\plauthorhl{% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi + }}{% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi + }% + \usebibmacro{name:andothers}% + \else% \if@hlauthor false \ifthenelse{\value{listcount}=1}{\ifthenelse{\value{editor}>1}{\bibopenparen\bibstring{with}\addspace}{}}{}% % Exclude omitted author \bpl@normalize{\namepartfamily}{\bpl@tsurname}% @@ -317,12 +469,12 @@ test { \ifnumless{\value{listcount}}{3} } } {}{% \ifnumless{\value{listcount}}{\value{liststop}-1}% - {\addcomma\addspace}% + {\multinamedelim}% {\iftoggle{hadmyself}{% \ifnumless{\value{listcount}}{\value{liststop}}% - {\addcomma\addspace}% - {\addspace\bibstring{and}\addspace}} - {\addspace\bibstring{and}\addspace}}% + {\multinamedelim}% + {\finalnamedelim}} + {\finalnamedelim}}% }% }% \ifgiveninits @@ -333,63 +485,120 @@ \namepartfamily}% \usebibmacro{name:andothers}% \ifthenelse{\value{listcount}=\value{liststop}\AND\value{editor}>1}{\unspace\bibcloseparen}{}% + \fi% end of \if@hlauthor else condition } \DeclareNameFormat{bookauthor}{% - \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% - \namepartfamily% - \ifgiveninits - {\ifdefvoid{\namepartgiveni}{}{\addcomma\space\namepartgiveni}}% - {\ifdefvoid{\namepartgiven}{}{\addcomma\space\namepartgiven}}% + \if@givenfirst% given name first + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\namepartgiven\addspace}}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \else% family name first + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% + \namepartfamily% + \ifgiveninits + {\ifdefvoid{\namepartgiveni}{}{\addcomma\addspace\namepartgiveni\addspace}}% + {\ifdefvoid{\namepartgiven}{}{\addcomma\addspace\namepartgiven\addspace}}% + \fi \ifthenelse{\value{listcount}<\value{liststop}} - {\addslash} + {\ifnumless{\value{listcount}}{\value{liststop}-1}% + {\multinamedelim}% + {\finalnamedelim}}% {}% \usebibmacro{name:andothers}} -\renewbibmacro*{name:andothers}{% - \ifthenelse{\value{listcount}=\value{liststop}\AND - \ifmorenames} - {\ifnum\value{liststop}>1 \finalandcomma\fi - \andothersdelim\biblcstring{andothers}} - {}} - % % Macros % \renewbibmacro*{author}{% + \if@hlauthor + \ifnameundef{author} + {} + {\usebibmacro{marginyear}% + \printnames{author}% + \setunit{\addspace}% + \iffieldundef{nameaddon} + {} + {\mkbibbrackets{\bibstring{alias}% + \addspace\printfield{nameaddon}}}} + \adddot\addspace\usebibmacro{year+labelyear}% + \else% \if@hlauthor false \ifnameundef{author} {} - {\usebibmacro{year+labelyear}\addspace% + {\usebibmacro{marginyear}% + \usebibmacro{year+labelyear}\addspace% \printnames{author}% \setunit{\addspace}% \iffieldundef{nameaddon} {} {\mkbibbrackets{\bibstring{alias}% - \addspace\printfield{nameaddon}}}}} + \addspace\printfield{nameaddon}}}} + \fi% end of \if@hlauthor else condition +} \renewbibmacro*{editor}{% + \if@hlauthor \ifnameundef{editor} {} - {\usebibmacro{year+labelyear}% + {\usebibmacro{marginyear}% + \printnames{editor}% + \setunit{\addspace}% + \usebibmacro{editorstrg}} + \adddot\addspace% + \usebibmacro{year+labelyear}% + \else% \if@hlauthor false + \ifnameundef{editor} + {} + {\usebibmacro{marginyear}% + \usebibmacro{year+labelyear}% \addspace% \printnames{editor}% \setunit{\addspace}% - \usebibmacro{editorstrg}}} + \usebibmacro{editorstrg}} + \fi% end of \if@hlauthor else condition +} \renewbibmacro*{editor+others}{% +\if@hlauthor \ifboolexpr{ test \ifuseeditor and not test {\ifnameundef{editor}} } - {\usebibmacro{year+labelyear}% + {\usebibmacro{marginyear}% + \printnames{editor}% + \setunit{\addcomma\space}% + \usebibmacro{editor+othersstrg}% + \adddot\addspace% + \usebibmacro{year+labelyear}% + \clearname{editor}} + {}% +\else% \if@hlauthor false + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{marginyear}% + \usebibmacro{year+labelyear}% \addspace% \printnames{editor}% \setunit{\addcomma\space}% \usebibmacro{editor+othersstrg}% \clearname{editor}} + {}% +\fi% end of \if@hlauthor else condition +} + +\renewbibmacro*{name:andothers}{% + \ifthenelse{\value{listcount}=\value{liststop}\AND + \ifmorenames} + {\ifnum\value{liststop}>1 \finalandcomma\fi + \andothersdelim\biblcstring{andothers}} {}} \newbibmacro*{date:makedate}{% @@ -417,28 +626,36 @@ } \fi } + +\newbibmacro*{marginyear}{% +\if@marginyear% + \iffieldundef{year}{% + \iffieldundef{pubstate}{}{% + \iffieldequals{pubstate}{\bbx@lasthash}{}{% + \printtext{\marginpar{\small\plmarginyear{\bibsentence\printfield{pubstate}}}}% + }% + }% + }{% + \iffieldequals{labelyear}{\bbx@lasthash}{}{% + \printtext{\marginpar{\small\plmarginyear{\bibsentence\printfield{labelyear}}}}% + }% + }% +\fi +} \newbibmacro*{year+labelyear}{% \iffieldundef{year}{% \iffieldundef{pubstate}{\let\bbx@lasthash\undefined}{% \usebibmacro{date:labelyear+extrayear}% - \if@marginyear% - \iffieldequals{pubstate}{\bbx@lasthash}{}{% - \printtext{\marginpar{\small\plmarginyear{\bibsentence\printfield{pubstate}}}}% + \savefield{pubstate}{\bbx@lasthash}% + \clearfield{pubstate}% }% - \fi - \savefield{pubstate}{\bbx@lasthash}% - \clearfield{pubstate}% - } }{% \usebibmacro{date:labelyear+extrayear}% - \if@marginyear% - \iffieldequals{labelyear}{\bbx@lasthash}{}{% - \printtext{\marginpar{\small\plmarginyear{\printfield{labelyear}}}}% - }% - \fi \savefield{labelyear}{\bbx@lasthash}% - }} + \clearfield{year}% + }% +} \newbibmacro*{rauthor/label}{% \ifnameundef{author} @@ -626,4 +843,58 @@ } } +% +% Mappings (biber) +% + +% Correctly sort pubstates. + +\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=year, final] + \step[fieldset=sortyear, origfieldval] + } + \map{ + \step[fieldsource=pubstate, match=\regexp{forthcoming}, final] + \step[fieldset=sortyear, fieldvalue={2222}] + } + \map{ + \step[fieldsource=pubstate, match=\regexp{inpress}, final] + \step[fieldset=sortyear, fieldvalue={3333}] + } + \map{ + \step[fieldsource=pubstate, match=\regexp{submitted}, final] + \step[fieldset=sortyear, fieldvalue={4444}] + } + \map{ + \step[fieldsource=pubstate, match=\regexp{inpreparation}, final] + \step[fieldset=sortyear, fieldvalue={5555}] + } + } +} + + +% +% Deprecated stuff +% + +% DEPRECATED as of v.1.4 +% Issue a warning if used. +\newtoggle{bpl:omitname} +\def\omitname{% + \toggletrue{bpl:omitname}% + \@ifnextchar[% + {\plauthorname@i} + {\plauthorname@i[]}% +} + +\AtEndPreamble{% + \iftoggle{bpl:omitname}{ + \PackageWarning{biblatex-publist}{The \protect\omitname\space macro is deprecated!\MessageBreak + Please use \protect\plauthorname\space instead.}{}% + } +} + + \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-publist/publist.cbx new/tex/latex/biblatex-publist/publist.cbx --- old/tex/latex/biblatex-publist/publist.cbx 2016-05-16 00:09:48.000000000 +0200 +++ new/tex/latex/biblatex-publist/publist.cbx 2017-04-12 23:08:34.000000000 +0200 @@ -26,8 +26,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl(a)version{1.2} -\def\bpl@rdate{2016/05/12} +\def\bpl(a)version{1.7} +\def\bpl@rdate{2017/04/12} \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space biblatex citation style (JSP)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-publist.tlpobj new/tlpkg/tlpobj/biblatex-publist.tlpobj --- old/tlpkg/tlpobj/biblatex-publist.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-publist.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,18 +1,19 @@ name biblatex-publist category Package -revision 41160 +revision 43765 shortdesc BibLaTeX bibliography support for publication lists relocated 1 longdesc The package provides a BibLaTeX bibliography style file (*.bbx) longdesc for publication lists. The style file draws on BibLaTeX's longdesc authoryear style, but provides some extra features often longdesc desired for publication lists, such as the omission of the -longdesc author's own name from author or editor data. -runfiles size=6 +longdesc author's own name from author or editor data. At least version +longdesc 3.4 of biblatex is required. +runfiles size=8 RELOC/tex/latex/biblatex-publist/publist.bbx RELOC/tex/latex/biblatex-publist/publist.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-publist -catalogue-date 2016-05-15 15:58:09 +0200 +catalogue-date 2017-04-12 10:03:22 +0200 catalogue-license lppl1.3 catalogue-topics biblatex -catalogue-version 1.2 +catalogue-version 1.7 ++++++ biblatex-realauthor.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.pdf and new/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.tex new/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.tex --- old/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.tex 2016-06-07 00:57:41.000000000 +0200 +++ new/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.tex 2016-11-25 19:28:16.000000000 +0100 @@ -9,6 +9,7 @@ \usepackage{shortvrb} \usepackage{pifont} \usepackage{minted} +\setminted{breaklines} % Usefull commands \newcommand{\biblatex}{biblatex\xspace} \pretocmd{\bibfield}{\sloppy}{}{} @@ -20,8 +21,8 @@ subtitle={New data field}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.4.0}, - date={06/05/2016}, + revision={2.7.0}, + date={23/10/2016}, url={https://github.com/maieul/biblatex-realauthor}} % biblatex @@ -42,7 +43,7 @@ \subsection{Requirement} -The packages require \biblatex~3.3 or later. +The packages require \biblatex~3.5 or later. \subsection{The .bib file} Basically, you just have to add the real author / editor name in the field \bibfield{realauthor} / \bibfield{realdeditor}, like in the following examples: @@ -106,6 +107,9 @@ \end{itemize} See the example file to have an illustration. + + +The package also provides \verb-realauthor+manuscripts- and \verb-realauthor+anonymous+manuscripts- sorting schemes to use in combination with the \emph{biblatex-manuscripts-philology} package (please read handbook of this package for more details about it). + \section{Disable realauthor use}\label{userealauthor} The package, or rather \biblatex, defines an \verb+userealauthor+ option, which can be settable on a per-entry basis in the \bibfield{options} field, or by entrytype, using \cmd{ExecuteBibliographyOptions}, or globally, when loading \biblatex. @@ -155,10 +159,27 @@ \begin{changelog} +\begin{release}{2.7.0}{2016-10-23} + \item New sorting schemes. +\end{release} + +\begin{release}{2.6.0}{2016-09-08} + \item Take account of \bibfield{realauthor} to manage dash in bibliography. + \item Require \biblatex\ 3.5. +\end{release} + +\begin{release}{2.5.0}{2016-06-09} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + + \begin{release}{2.4.1}{2016-06-07} + \item Fix bug with abreviatted form of citation. + \end{release} \begin{release}{2.4.0}{2016-06-05} - \item Adds \bibfield{realeditor}. - \item Restores normal behavior of \opt{userealeditor}. - \item Uses \bibfield{realauthor} / \bibfield{realeditor} in the abreviatted form of citation. + \item Add \bibfield{realeditor}. + \item Restores normal behavior of \opt{userealeauthor}. + \item Takes account of the real names when choosing to print a dash in the final bibliography. + \item Requires biblatex 3.3. \end{release} \begin{release}{2.3.0}{2016-03-11} @@ -176,7 +197,7 @@ \end{release} \begin{release}{2.1.0}{2014-10-30} - \item Add new \verb|realauthor| scheme. \see{sorting} + \item Add new \verb|realauthor| sorting scheme. \see{sorting} \end{release} Binary files old/doc/latex/biblatex-realauthor/documentation/example-realauthor.pdf and new/doc/latex/biblatex-realauthor/documentation/example-realauthor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-realauthor.doc.tlpobj new/tlpkg/tlpobj/biblatex-realauthor.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-realauthor.doc.tlpobj 2016-06-07 17:33:41.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-realauthor.doc.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-realauthor.doc category Package -revision 41298 +revision 42390 shortdesc doc files of biblatex-realauthor relocated 1 -docfiles size=30 +docfiles size=31 RELOC/doc/latex/biblatex-realauthor/README RELOC/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.pdf RELOC/doc/latex/biblatex-realauthor/documentation/biblatex-realauthor.tex ++++++ biblatex-realauthor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-realauthor/realauthor.bbx new/tex/latex/biblatex-realauthor/realauthor.bbx --- old/tex/latex/biblatex-realauthor/realauthor.bbx 2016-06-07 00:57:41.000000000 +0200 +++ new/tex/latex/biblatex-realauthor/realauthor.bbx 2016-11-25 19:33:43.000000000 +0100 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{realauthor.dbx} -[2016/06/05 v2.4.0 biblatex bibliography style (MR)] +[2016/10/23 v2.7.0 biblatex bibliography style (MR)] \ifdef{\biblatexmultipledm@bibstyle} {\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}} @@ -81,33 +81,36 @@ \usebibmacro{name:andothers}}} % Patching some standard bibmacros -%% For the drivers +\newcommand{\realauthor@failpatch}[1]{\PackageError{realauthor}{Fail to patch `#1` bibmacro}{}} + \xapptobibmacro{author}{% \ifnameundef{author}{}{% \ifnameundef{realauthor}{}{\addspace\nopunct}% }% \printnames{realauthor}% {}% -}{}{} +} + {} + {\realauthor@failpatch{author}} \xpatchbibmacro{author/editor+others} {not test {\ifnameundef{author}}} {not (test {\ifnameundef{author}} and test {\ifnameundef{realauthor}})} {} - {} + {\realauthor@failpatch{author/editor+others}} \xpatchbibmacro{author/translator+others} {not test {\ifnameundef{author}}} {not (test {\ifnameundef{author}} and test {\ifnameundef{realauthor}})} {} - {} + {\realauthor@failpatch{author/translator+others}} \xpatchbibmacro{author/editor+others/translator+others} {not test {\ifnameundef{author}}} {not (test {\ifnameundef{author}} and test {\ifnameundef{realauthor}})} {} - {} + {\realauthor@failpatch{author/editor+others/translator+others}} \xpatchbibmacro{author/editor+others/translator+others} @@ -129,7 +132,8 @@ )% }% } -{}{} + {}% + {\realauthor@failpatch{author/editor+others/translator+others}} @@ -152,41 +156,49 @@ )% }% } -{}{} + {} + {\realauthor@failpatch{bbx:editor}} + \xpatchbibmacro{bbx:editor} {\clearname{editor}} {\clearname{editor} \clearname{realeditor} } -{}{} + {} + {\realauthor@failpatch{bbx:editor}} \xpatchbibmacro{bbx:editor} {\printnames{editor}}% {\printnames{editor}% \usebibmacro{printeditor}% }% -{}{} + {} + {\realauthor@failpatch{bbx:editor}} \xpatchbibmacro{byeditor} {\ifnameundef{editor}}% {\ifboolexpr{test{\ifnameundef{editor}} and test{\ifnameundef{realeditor}}}}% -{}{} + {} + {\realauthor@failpatch{byeditor}} \xpatchbibmacro{byeditor} {\printnames[byeditor]{editor}}% {\usebibmacro{printbyeditor+realeditor}} -{}{} + {} + {\realauthor@failpatch{byeditor}} \xpatchbibmacro{byeditor+others} {\ifnameundef{editor}}% {\ifboolexpr{test{\ifnameundef{editor}} and test{\ifnameundef{realeditor}}}}% -{}{} + {} + {\realauthor@failpatch{byeditor+others}} \xpatchbibmacro{byeditor+others} {\printnames[byeditor]{editor}}% {\usebibmacro{printbyeditor+realeditor}} -{}{} + {} + {\realauthor@failpatch{byeditor+others}} \newbibmacro{printbyeditor+realeditor}{% \printnames[byeditor]{editor}% @@ -218,29 +230,84 @@ {% \printnames{labelname}% \ifnamesequal{labelname}{author}{% - \ifnameundef{realauthor}{}{\addspace\nopunct}% - \printnames{realauthor}% + \ifnameundef{realauthor}% + {}% + {\addspace\nopunct\printnames{realauthor}}% }{}% \ifnamesequal{labelname}{editor}{% - \ifnameundef{realeditor}{}{\addspace\nopunct}% - \printnames{realeditor}% + \ifnameundef{realeditor}% + {}% + {\addspace\nopunct\printnames{realeditor}}% }{}% }% } \AtBeginDocument{% - \xpatchbibmacro{cite:name}{\printnames{labelname}}{\usebibmacro{realauthor:as:labelname}}{}{} + \ifcsvoid{abx@macro@cite:name}{}{% + \xpatchbibmacro{cite:name}% + {\printnames{labelname}} + {\usebibmacro{realauthor:as:labelname}} + {} + {\realauthor@failpatch{cite:name}} + }% } -% Sorting +% For the dash on the bibliography, in the case two real author use the same pseudonym +\AtBeginDocument{ +\xapptobibmacro{bbx:savehash}{% + \ifboolexpr{% + test {\ifnamesequal{labelname}{author}}% + and + not test {\ifnameundef{realauthor}}% + }% + {% + \xappto\bbx@lasthash{\thefield{realeauthorfullhash}}% + }% + {}% + \ifboolexpr{% + test {\ifnamesequal{labelname}{editor}}% + and + not test {\ifnameundef{realeditor}}% + }% + {% + \xappto\bbx@lasthash{\thefield{realeditorfullhash}}% + }% + {}% +} +{}{\realauthor@failpatch{bbx:savehash}} -\DeclareSortingScheme{realauthor}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } +\xpretobibmacro{bbx:dashcheck}{% + \savefield{fullhash}{\bbx@this@hash}% + \ifboolexpr{% + test {\ifnamesequal{labelname}{author}}% + and + not test {\ifnameundef{realauthor}}% + }% + {% + \eappto\bbx@this@hash{\thefield{realauthorfullhash}}% + }% + {}% + \ifboolexpr{% + test {\ifnamesequal{labelname}{editor}}% + and + not test {\ifnameundef{realeditor}}% + }% + {% + \eappto\bbx@this@hash{\thefield{realeditorfullhash}}% + }% + {}% +} +{}{\realauthor@failpatch{bbx:dashchek}} + +\xpatchbibmacro{bbx:dashcheck}% + {\iffieldequals{fullhash}{\bbx@lasthash}}% + {\ifdefequal{\bbx@this@hash}{\bbx@lasthash}}% +{}{\realauthor@failpatch{bbx:dashchek}} + +} +% Sorting + +\def\bbx@realauthor@sorting{ \sort{ \field{sortname} \field{author} @@ -265,13 +332,7 @@ } } -\DeclareSortingScheme{anonymous+realauthor}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } +\def\bbx@realauthor@sorting@anonymous{ \sort{ \field{sortname} \field{author} @@ -295,5 +356,51 @@ } } +\DeclareSortingScheme{realauthor}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@realauthor@sorting +} + +\DeclareSortingScheme{anonymous+realauthor}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@realauthor@sorting@anonymous +} + + +\AtEndPreamble{ + \ifundef{\bbx@manuscripts@sorting}{}% + { + \DeclareSortingScheme{realauthor+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@realauthor@sorting + \bbx@manuscripts@sorting + } + \DeclareSortingScheme{anonymous+realauthor+manuscripts}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \bbx@realauthor@sorting@anonymous + \bbx@manuscripts@sorting + } + } +} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-realauthor/realauthor.dbx new/tex/latex/biblatex-realauthor/realauthor.dbx --- old/tex/latex/biblatex-realauthor/realauthor.dbx 2016-06-07 00:57:41.000000000 +0200 +++ new/tex/latex/biblatex-realauthor/realauthor.dbx 2016-11-25 19:33:43.000000000 +0100 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{realauthor.dbx} -[2016/06/05 v2.4.0 biblatex bibliography style (MR)] +[2016/10/23 v2.7.0 biblatex bibliography style (MR)] \DeclareDatamodelFields[type=list,datatype=name]{realauthor,realeditor} \DeclareDatamodelEntryfields{realauthor,realeditor} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-realauthor.tlpobj new/tlpkg/tlpobj/biblatex-realauthor.tlpobj --- old/tlpkg/tlpobj/biblatex-realauthor.tlpobj 2016-06-07 17:33:41.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-realauthor.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,16 +1,16 @@ name biblatex-realauthor category Package -revision 41298 +revision 42390 shortdesc Indicate the real author of a work relocated 1 longdesc This package allows to use a new field "realauthor", which longdesc indicates the real author of a work, when published in a longdesc pseudepigraphic name. -runfiles size=3 +runfiles size=4 RELOC/tex/latex/biblatex-realauthor/realauthor.bbx RELOC/tex/latex/biblatex-realauthor/realauthor.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-realauthor -catalogue-date 2016-06-07 13:00:31 +0200 +catalogue-date 2016-10-23 21:52:34 +0200 catalogue-license lppl1.3 catalogue-topics biblatex -catalogue-version 2.4.1 +catalogue-version 2.7.0 ++++++ biblatex-science.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-science/biblatex-science.bib new/doc/latex/biblatex-science/biblatex-science.bib --- old/doc/latex/biblatex-science/biblatex-science.bib 2016-03-12 00:39:27.000000000 +0100 +++ new/doc/latex/biblatex-science/biblatex-science.bib 2016-11-25 19:28:16.000000000 +0100 @@ -78,9 +78,10 @@ } @Online{Corina2006, - title = {CORINA: Generation of 3D coordinates}, - url = {http://www.molecular-networks.com/software/corina/index.html}, - year = {2006} + title = {CORINA: Generation of 3D coordinates}, + url = {http://www.molecular-networks.com/software/corina/index.html}, + year = {2006}, + urlyear = {2006} } @Book{Coghill2006, @@ -263,7 +264,7 @@ title = {Alkylation of boron trifluoride with pentafluorophenyl Grignard reagent}, year = {2003}, - urlyear = {2008-10-08}, + urldate = {2008-10-08}, url = {http://www.syntheticpages.org/pages/215} } Binary files old/doc/latex/biblatex-science/biblatex-science.pdf and new/doc/latex/biblatex-science/biblatex-science.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-science/biblatex-science.tex new/doc/latex/biblatex-science/biblatex-science.tex --- old/doc/latex/biblatex-science/biblatex-science.tex 2016-03-13 22:18:59.000000000 +0100 +++ new/doc/latex/biblatex-science/biblatex-science.tex 2016-11-25 19:28:16.000000000 +0100 @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright(a)morningstar2.co.uk}}}} \title{The \pkg{science} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1f, last revised 2016/03/13.}} -\date{Released 2016/03/13} + \footnote{This file describes v1.1g, last revised 2016/09/13.}} +\date{Released 2016/09/13} \providecommand*\opt[1]{\texttt{#1}} \providecommand*\pkg[1]{\textsf{#1}} @@ -84,6 +84,7 @@ \changes{v1.1d}{2013/01/27}{Include related entry data} \changes{v1.1e}{2016/03/10}{Track \pkg{biblatex} changes} \changes{v1.1f}{2016/03/13}{Ensure style works with both backends} +\changes{v1.1g}{2016/09/13}{Work properly with \texttt{urldate} option} \PrintChanges diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-science.doc.tlpobj new/tlpkg/tlpobj/biblatex-science.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-science.doc.tlpobj 2016-04-14 18:42:24.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-science.doc.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-science.doc category Package -revision 40018 +revision 42147 shortdesc doc files of biblatex-science relocated 1 docfiles size=98 ++++++ biblatex-science.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-science/science.bbx new/tex/latex/biblatex-science/science.bbx --- old/tex/latex/biblatex-science/science.bbx 2016-03-13 22:18:59.000000000 +0100 +++ new/tex/latex/biblatex-science/science.bbx 2016-11-25 19:33:43.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{science.bbx}[2016/03/13 v1.1f biblatex bibliography style] +\ProvidesFile{science.bbx}[2016/09/13 v1.1g biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -25,6 +25,7 @@ giveninits , maxnames = 5 , maxcitenames = 2 , + urldate = year , useprefix , } @@ -79,6 +80,7 @@ \DeclareFieldFormat[article]{title}{#1\adddot\space\nopunct} \DeclareFieldFormat[report]{title}{\mkbibquote{#1}} \DeclareFieldFormat{url}{\url{#1}} +\DeclareFieldFormat{urldate}{#1} \DeclareFieldFormat[article,periodical]{volume}{\mkbibbold{#1}} % Simple modifications to punctuation, etc. @@ -198,6 +200,16 @@ }% } +\renewbibmacro*{url+urldate}{% + \iffieldundef{url} + {} + {% + \printtext[parens]{% + \usebibmacro{urldate}% + \setunit*{\addsemicolon\space}% + \usebibmacro{url}% + }}} + % New bibliography drivers, using the required order of fields. These % are mainly copied from standard.bbx then modified. \DeclareBibliographyDriver{article}{% @@ -462,13 +474,7 @@ {\usebibmacro{eprint}} {}% \nopunct - \printtext[parens]{% - \iffieldundef{year} - {\printfield{urlyear}} - {\usebibmacro{date}}% - \setunit*{\addsemicolon\space}% - \printfield{url}% - }% + \usebibmacro{url+urldate}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-science/science.cbx new/tex/latex/biblatex-science/science.cbx --- old/tex/latex/biblatex-science/science.cbx 2016-03-13 22:18:59.000000000 +0100 +++ new/tex/latex/biblatex-science/science.cbx 2016-11-25 19:33:43.000000000 +0100 @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{science.cbx}[2016/03/13 v1.1f biblatex citation style] +\ProvidesFile{science.cbx}[2016/09/13 v1.1g biblatex citation style] \RequireCitationStyle{numeric-comp} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-science.tlpobj new/tlpkg/tlpobj/biblatex-science.tlpobj --- old/tlpkg/tlpobj/biblatex-science.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-science.tlpobj 2017-04-14 17:31:55.000000000 +0200 @@ -1,15 +1,15 @@ name biblatex-science category Package -revision 40018 +revision 42147 shortdesc BibLaTeX implementation of the Science bibliography style relocated 1 -longdesc The bundle offers styles that allow authors to use biblatex +longdesc The bundle offers styles that allow authors to use BibLaTeX longdesc when preparing papers for submission to the journal Science. runfiles size=5 RELOC/tex/latex/biblatex-science/science.bbx RELOC/tex/latex/biblatex-science/science.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-science -catalogue-date 2016-03-13 13:51:31 +0100 +catalogue-date 2016-09-13 11:01:57 +0200 catalogue-license lppl1.3 catalogue-topics biblatex journalpub -catalogue-version 1.1f +catalogue-version 1.1g ++++++ biblatex-source-division.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-source-division/biblatex-source-division.pdf and new/doc/latex/biblatex-source-division/biblatex-source-division.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-source-division/biblatex-source-division.tex new/doc/latex/biblatex-source-division/biblatex-source-division.tex --- old/doc/latex/biblatex-source-division/biblatex-source-division.tex 2015-07-09 00:31:44.000000000 +0200 +++ new/doc/latex/biblatex-source-division/biblatex-source-division.tex 2016-11-25 19:28:16.000000000 +0100 @@ -24,8 +24,8 @@ email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, subtitle={}, - revision={2.3.1}, - date={07/07/2015}, + revision={2.4.1}, + date={09/07/2016}, url={https://github.com/maieul/biblatex-source-division}} % Hyphen \hyphenation{Ma-de-lei-ne} @@ -106,6 +106,15 @@ \begin{changelog} +\begin{release}{2.4.1}{2016-06-07} + \item Fix bug when using \cs{volcite} command and related. +\end{release} + + +\begin{release}{2.4.0}{2016-06-07} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + \begin{release}{2.3.1}{2015-07-07} \item Fix compatibility with op. cit. form when using bibstyle `verbose-trad1'. \end{release} Binary files old/doc/latex/biblatex-source-division/issue1.pdf and new/doc/latex/biblatex-source-division/issue1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-source-division.doc.tlpobj new/tlpkg/tlpobj/biblatex-source-division.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-source-division.doc.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-source-division.doc.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,13 +1,12 @@ name biblatex-source-division.doc category Package -revision 37806 +revision 41675 shortdesc doc files of biblatex-source-division relocated 1 -docfiles size=27 +docfiles size=22 RELOC/doc/latex/biblatex-source-division/README RELOC/doc/latex/biblatex-source-division/biblatex-source-division.bib RELOC/doc/latex/biblatex-source-division/biblatex-source-division.pdf RELOC/doc/latex/biblatex-source-division/biblatex-source-division.tex - RELOC/doc/latex/biblatex-source-division/issue1.pdf RELOC/doc/latex/biblatex-source-division/latexmkrc RELOC/doc/latex/biblatex-source-division/makefile ++++++ biblatex-source-division.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-source-division/biblatex-source-division.sty new/tex/latex/biblatex-source-division/biblatex-source-division.sty --- old/tex/latex/biblatex-source-division/biblatex-source-division.sty 2015-07-09 00:31:44.000000000 +0200 +++ new/tex/latex/biblatex-source-division/biblatex-source-division.sty 2016-11-25 19:33:43.000000000 +0100 @@ -1,4 +1,4 @@ -%% Copyright 2013 Maïeul Rouquette +%% Copyright 2013-… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -15,7 +15,7 @@ % This work consists of the file biblatex-source-division.sty \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-source-division}[2015/07/07 v2.3.1 source division for biblatex] +\ProvidesPackage{biblatex-source-division}[2016/07/09 v2.4.1 source division for biblatex] \RequirePackage{xpatch} % The options @@ -81,17 +81,25 @@ \newrobustcmd*{\volgetsourcedivision@}[2]{% \gdef\volpostnote{#2}% \gdef\volvol{#1}% - \ifdefempty{volpostnote}% + \ifdefempty{\volpostnote}% {\clearfield{volpostnote}}% {\restorefield{volpostnote}{\volpostnote}}% \usefield{\getsourcedivision@}{volpostnote}% } % Insert source division in bibmacro for abreviated forms +\newcommand{\sourcedivision@failtopatch}[1]{\PackageError{biblatex-source-division}{Fail to patch `#1` bibmacro}{}} + +\def\do#1{% + \ifcsvoid{abx@macro@#1}{}{% + \xapptobibmacro{#1}% + {\newunit\printfield{titleaddon}\printfield{maintitleaddon}}% + {}% + {\sourcedivision@failtopatch{#1}}% + } +} + +\docsvlist{cite:ibid,cite:opcit,cite:short,cite:title} -\xapptobibmacro{cite:ibid}{\newunit\printfield{titleaddon}\printfield{maintitleaddon}}{}{} -\xapptobibmacro{cite:opcit}{\newunit\printfield{titleaddon}\printfield{maintitleaddon}}{}{} -\xapptobibmacro{cite:short}{\newunit\printfield{titleaddon}\printfield{maintitleaddon}}{}{} -\xapptobibmacro{cite:title}{\newunit\printfield{titleaddon}\printfield{maintitleaddon}}{}{} \endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-source-division.tlpobj new/tlpkg/tlpobj/biblatex-source-division.tlpobj --- old/tlpkg/tlpobj/biblatex-source-division.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-source-division.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-source-division category Package -revision 37806 +revision 41675 shortdesc References by "division" in classical sources relocated 1 longdesc The package enables the user to make reference to "division @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/biblatex-source-division/biblatex-source-division.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-source-division -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-09 21:38:34 +0200 catalogue-license lppl1.3 catalogue-topics biblio biblatex -catalogue-version 2.3.1 +catalogue-version 2.4.1 ++++++ biblatex-subseries.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf and new/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf differ Binary files old/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf and new/doc/latex/biblatex-subseries/documentation/biblatex-subseries.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex new/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex --- old/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex 2015-05-15 23:49:03.000000000 +0200 +++ new/doc/latex/biblatex-subseries/documentation/biblatex-subseries.tex 2017-02-25 00:01:03.000000000 +0100 @@ -24,8 +24,8 @@ subtitle={New data fields}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.0.0a}, - date={14/05/2015}, + revision={1.2.0}, + date={24/02/2017}, url={https://git.framasoft.org/maieul/biblatex-subseries}} % biblatex @@ -38,18 +38,24 @@ \tableofcontents \section{Introduction} -Some publishers organize book series with subseries. In this case, two numbers are associated with one volume: the number inside the series and the number inside the subseries. That is the case of the series \emph{\foreignlanguage{latin}{Corpus Scriptorium Christianorum Orientalium}} published by Peeters.\footnote{\url{http://www.peeters-leuven.be/search_serie_book.asp?nr=94}} +Some publishers organize book series with subseries. In this case, two numbers are associated with one volume: the number inside the series and the number inside the subseries. That is the case, for example, of the series \emph{\foreignlanguage{latin}{Corpus Scriptorium Christianorum Orientalium}} published by Peeters.\footnote{\url{http://www.peeters-leuven.be/search_serie_book.asp?nr=94}.} +Sometime, there is also subsubseries, and number for subsubseries. + This package provides new fields to manage such system. \section{Basic use} \subsection{The .bib file} -You can use three more fields: +You can use six additional fields: \begin{fieldlist} \fielditem{shortsubseries}{literal\LFMark} The shorthand form of the subseries. Not used by default styles. \fielditem{subnumber}{literal} The number of the book inside the subseries. \fielditem{subseries}{literal} The subseries. +\fielditem{shortsubsubseries}{literal\LFMark} The shorthand form of the subsubseries. Not used by default styles. +\fielditem{subsubnumber}{literal} The number of the book inside the subsubseries. +\fielditem{subsubseries}{literal} The subsubseries. + \end{fieldlist} @@ -72,9 +78,11 @@ \end{quotation} \section{Customization} -You can redefine \cmd{subseriesseparator} to change the separator between series and subseries. +You can redefine \cmd{subseriesseparator} to change the separator between series and subseries. You can also redefine \cmd{subsubseriesseparator} to change the separator between subseries and subsubseries. By default, it is the same as \cmd{subseriesseparator}. -If you want to customize the \verb+series+number+ bibmacro, do not forget to call the \verb|subseries+subnumber| bibmacro inside. You can also redefine it. +If you want to customize the \verb+series+number+ bibmacro, do not forget to call the \verb|subseries+subnumber| bibmacro inside. + +You can also redefine this macro, and redefine the \verb+subsubseries+subsubnumber+ bibmacro which is called by the \verb|subseries+subnumber| bibmacro. \section{Use with other packages which provide new fields} @@ -92,6 +100,14 @@ \begin{changelog} +\begin{release}{1.2.0}{2017-02-24} + \item Add \bibfield{subsubseries}, \bibfield{subsubnumber} and \bibfield{shortsubsubseries} fields. +\end{release} + +\begin{release}{1.1.0}{2016-06-07} + \item Add error message to know more quickly break compatibility with new releases of biblatex. +\end{release} + \begin{release}{1.0.0a}{2015-05-14} \item Fix typo in handbook. \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-subseries.doc.tlpobj new/tlpkg/tlpobj/biblatex-subseries.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-subseries.doc.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-subseries.doc.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-subseries.doc category Package -revision 37415 +revision 43330 shortdesc doc files of biblatex-subseries relocated 1 -docfiles size=23 +docfiles size=25 RELOC/doc/latex/biblatex-subseries/README RELOC/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.bib RELOC/doc/latex/biblatex-subseries/documentation/biblatex-subseries-example.pdf ++++++ biblatex-subseries.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-subseries/subseries.bbx new/tex/latex/biblatex-subseries/subseries.bbx --- old/tex/latex/biblatex-subseries/subseries.bbx 2015-05-15 23:49:03.000000000 +0200 +++ new/tex/latex/biblatex-subseries/subseries.bbx 2017-02-25 00:01:05.000000000 +0100 @@ -1,4 +1,4 @@ -%% Copyright 2014 Maïeul Rouquette +%% Copyright 2014-… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -13,7 +13,7 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files subseries.dbx, subseries.bbx \ProvidesFile{subseries.dbx} -[2015/05/14 v1.0.0a biblatex bibliography style (MR)] +[2017/02/24 v1.2.0 biblatex bibliography style (MR)]% \ifdef{\biblatexmultipledm@bibstyle} {\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}} @@ -21,15 +21,32 @@ \RequirePackage{xpatch} -\xapptobibmacro{series+number}{\usebibmacro{subseries+subnumber}}{}{}%Patch the standard bibmacro series+number +\newcommand{\subseries@failtopatch}[1]{% + \PackageError{biblatex-subseries}{Unable to patch `#1` bibmacro}{}% +}% + +%Patch the standard bibmacro series+number +\xapptobibmacro{series+number}% + {\usebibmacro{subseries+subnumber}}% + {}% + {\subseries@failtopatch{series+number}}% \newbibmacro{subseries+subnumber}{%A default subseries+subnumber style - \setunit *{\subseriesseparator}% + \setunit*{\subseriesseparator}% \printfield{subseries}% - \setunit *{\addspace}% + \setunit*{\addspace}% \printfield{subnumber}% + \usebibmacro{subsubseries+subsubnumber}% \newunit% } -\newcommand{\subseriesseparator}{\addspace---\addspace} +\newbibmacro{subsubseries+subsubnumber}{% + \setunit*{\subsubseriesseparator}% + \printfield{subsubseries}% + \setunit*{\addspace}% + \printfield{subsubnumber}% +}% + +\newcommand{\subseriesseparator}{\addspace---\addspace}% +\newcommand{\subsubseriesseparator}{\subseriesseparator}% \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-subseries/subseries.dbx new/tex/latex/biblatex-subseries/subseries.dbx --- old/tex/latex/biblatex-subseries/subseries.dbx 2015-05-15 23:49:03.000000000 +0200 +++ new/tex/latex/biblatex-subseries/subseries.dbx 2017-02-25 00:01:05.000000000 +0100 @@ -1,4 +1,4 @@ -%% Copyright 2014 Maïeul Rouquette +%% Copyright 2014-… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -13,11 +13,16 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files subseries.dbx, subseries.bbx \ProvidesFile{subseries.dbx} -[2015/05/14 v1.0.0a biblatex bibliography style (MR)] +[2017/02/24 v1.2.0 biblatex bibliography style (MR)] \DeclareDatamodelFields[type=field,datatype=literal]{% subnumber,% subseries,% + subsubnumber,% + subsubseries,% +} +\DeclareDatamodelFields[type=field,datatype=literal,label=true]{% + shortsubseries,% + shortsubsubseries% } -\DeclareDatamodelFields[type=field,datatype=literal,label=true]{shortsubseries} \endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-subseries.tlpobj new/tlpkg/tlpobj/biblatex-subseries.tlpobj --- old/tlpkg/tlpobj/biblatex-subseries.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-subseries.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,6 +1,6 @@ name biblatex-subseries category Package -revision 37415 +revision 43330 shortdesc Manages subseries with BibLaTeX relocated 1 longdesc Some publishers organize book series with subseries. In this @@ -13,7 +13,7 @@ RELOC/tex/latex/biblatex-subseries/subseries.bbx RELOC/tex/latex/biblatex-subseries/subseries.dbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-subseries -catalogue-date 2015-08-03 06:38:55 +0200 +catalogue-date 2017-02-24 14:27:22 +0100 catalogue-license lppl1.3 catalogue-topics biblatex biblio -catalogue-version 1.0.0a +catalogue-version 1.2.0 ++++++ biblatex-swiss-legal.doc.tar.xz ++++++ ++++++ biblatex-swiss-legal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-swiss-legal.tlpobj new/tlpkg/tlpobj/biblatex-swiss-legal.tlpobj --- old/tlpkg/tlpobj/biblatex-swiss-legal.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-swiss-legal.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -3,7 +3,7 @@ revision 32750 shortdesc Bibliography and citation styles following Swiss legal practice relocated 1 -longdesc The package provides biblatex bibliography and citation styles +longdesc The package provides BibLaTeX bibliography and citation styles longdesc for documents written in accordance with Swiss legal citation longdesc standards. Currently, the package is usable for French and longdesc German documents. @@ -21,7 +21,7 @@ RELOC/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.bbx RELOC/tex/latex/biblatex-swiss-legal/biblatex-swiss-legal-shortarticle.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-swiss-legal -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics legal french german biblatex catalogue-version 1.1.2a ++++++ biblatex-trad.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-trad/README.md new/doc/latex/biblatex-trad/README.md --- old/doc/latex/biblatex-trad/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-trad/README.md 2016-11-25 19:28:17.000000000 +0100 @@ -0,0 +1,29 @@ +biblatex-trad +============= + +traditional bibliography styles with [`biblatex`](http://www.ctan.org/pkg/biblatex) + +Introduction +------------- + +The complete idea was inspired by a question at [tex.stackexchange](http://tex.stackexchange.com/): + +[How to emulate the traditional BibTeX styles (plain, abbrv, unsrt, alpha) as closely as possible with biblatex?](http://tex.stackexchange.com/a/69706/) + +Installation +------------- + +The package is published via [CTAN](https://www.ctan.org/pkg/biblatex-trad) and should be available via your favourite distribution. + +The development branch can be downloaded here. I provide a simple `Makefile` which allows you to install the current development branch via + + make localinstall + +Licence +------------- +Copyright (c) 2012 -- 2015 Marco Daniel + 2016 -- Moritz Wemheuer + +This package is released under the terms of the LaTeX Project +Public License v1.3c or later. +See http://www.latex-project.org/lppl.txt \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-trad/README.txt new/doc/latex/biblatex-trad/README.txt --- old/doc/latex/biblatex-trad/README.txt 2012-09-30 00:41:39.000000000 +0200 +++ new/doc/latex/biblatex-trad/README.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -================================================================ -Implementation of the tradition bibliography styles into -biblatex. - -================================================================ -The current development is available at github: -https://github.com/marcodaniel/trad-biblatex - -================================================================ -Copyright (c) 2012 Marco Daniel - -This package may be distributed under the terms of the LaTeX Project -Public License, as described in lppl.txt in the base LaTeX distribution. -Either version 1.0 or, at your option, any later version. - Binary files old/doc/latex/biblatex-trad/biblatex-trad.pdf and new/doc/latex/biblatex-trad/biblatex-trad.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-trad/biblatex-trad.tex new/doc/latex/biblatex-trad/biblatex-trad.tex --- old/doc/latex/biblatex-trad/biblatex-trad.tex 2012-09-30 00:41:39.000000000 +0200 +++ new/doc/latex/biblatex-trad/biblatex-trad.tex 2016-11-25 19:28:17.000000000 +0100 @@ -7,11 +7,9 @@ \documentclass{ltxdockit}[2011/03/25] \usepackage{btxdockit} \usepackage[utf8]{inputenc} -\usepackage[american]{babel} +\usepackage[british]{babel} \usepackage[strict]{csquotes} -\usepackage{shortvrb} -\usepackage{pifont} -\usepackage{libertine-type1} +\usepackage{libertine} \usepackage[scaled=0.8]{beramono} \usepackage{microtype} \lstset{basicstyle=\ttfamily,keepspaces=true} @@ -27,38 +25,30 @@ \MakeAutoQuote*{<}{>} -\MakeShortVerb{\|} -\newcommand*{\biber}{Biber\xspace} \titlepage{% title={The \sty{biblatex-trad} Package}, subtitle={Traditional bibliography styles for \sty{biblatex}}, url={}, - author={Marco Daniel}, - email={marco.daniel(a)mada-nada.de}, - revision={0.2}, - date={29. Sep 2012}} + author={Marco Daniel\\Moritz Wemheuer}, + email={}, + revision={0.3}, + date={\today}} \hypersetup{% pdftitle={The biblatex-trad Package}, pdfsubject={Traditional bibliography styles for biblatex}, pdfauthor={Marco Daniel}, - pdfkeywords={tex, latex, bibtex, bibliography, references, citation}} + pdfkeywords={tex, latex, biblatex, bibtex, bibliography, references, citation}} \newrobustcmd*{\Deprecated}{% \textcolor{spot}{\margnotefont Deprecated}} \newrobustcmd*{\DeprecatedMark}{% \leavevmode\marginpar{\Deprecated}} -\newrobustcmd*{\BiberOnly}{% - \textcolor{spot}{\margnotefont Biber only}} -\newrobustcmd*{\BiberOnlyMark}{% - \leavevmode\marginpar{\BiberOnly}} -\newrobustcmd*{\BibTeXOnly}{% - \textcolor{spot}{\margnotefont BibTeX only}} -\newrobustcmd*{\BibTeXOnlyMark}{% - \leavevmode\marginpar{\BibTeXOnly}} +\newcommand*{\gitissuelink}[1]{% + \href{https://github.com/moewew/biblatex-trad/issues/#1}{issue \##1 on github}} \hyphenation{% star-red @@ -74,60 +64,82 @@ \section{Introduction}\label{sec:int} -The package \sty{biblatex-trad} is a contribution to the great package \sty{biblatex}. +The package \sty{biblatex-trad} is a contribution to the great package \sty{biblatex}. It provides the implementation of the traditional bibliography styles (\sty{plain}, \sty{unsrt}, \sty{alpha} and \sty{abbrv}) as a style for \sty{biblatex}. \subsection{Motivation}\label{subsec:int:mot} -The package is motivated by a question at \tex-\latex Stack Exchange \glqq \href{http://tex.stackexchange.com/}{How to emulate the traditional BibTeX styles (plain, abbrv, unsrt, alpha) as closely as possible with biblatex?} +The package is motivated by a question at \tex{} -- \latex Stack Exchange +\enquote{\href{http://tex.stackexchange.com/a/69706/}{How to emulate the traditional BibTeX styles +(\sty{plain}, \sty{abbrv}, \sty{unsrt}, \sty{alpha}) as closely as possible with \sty{biblatex}?}} \subsection{Requirements} - -The usage of the styles requires \sty{biblatex} 2.0 or newer. +The usage of the styles requires the \sty{biblatex} package. +It is tested with the current version of \sty{biblatex} (at the time of writing that is 3.4). +Care has been taken to retain backwards compatibility with older versions, +but please do not expect the styles to work flawlessly with ancient versions of \sty{biblatex}. +Note also that the style may fail silently with older versions, it need not necessarily emit noisy +warnings or error messages, the output might just be wrong. + +Note that in recent versions of \sty{biblatex} the \bibtex backend has been degraded to +the status of \enquote{fallback backend}. +Many features of this style will only work properly if you use the default Biber backend. \subsection{License} -Copyright \textcopyright\ 2006--2012 Marco Daniel. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}. +Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} \subsection{Feedback}\label{subsec:int:feb} -Please use the \sty{biblatex-trad} project page on GitHub to report bugs and submit feature requests.\fnurl{https://github.com/marcodaniel/trad-biblatex} +Please use the \sty{biblatex-trad} project page on GitHub to report bugs and submit feature requests.\fnurl{https://github.com/moewew/biblatex-trad} -If you do not want to report a bug or request a feature but are simply in need of assistance, you might want to consider posting your question on the \texttt{comp.text.tex} newsgroup or \tex-\latex Stack Exchange.\fnurl{http://tex.stackexchange.com/questions/tagged/biblatex} +If you do not want to report a bug or request a feature but are simply in need of assistance, you might want to consider posting your question on the \texttt{comp.text.tex} newsgroup or \tex{} -- \latex Stack Exchange.\fnurl{http://tex.stackexchange.com/questions/tagged/biblatex} \section{Usage} -\sty{biblatex-trad} isn't a standalone package. As described in \secref{sec:int} it's +\sty{biblatex-trad} is not a standalone package. As described in \secref{sec:int} it is a small collection of styles. So you can load the styles as follows: -\begin{lstlisting}[style=latex]{} -\usepackage[style=XXX]{biblatex} +\begin{lstlisting}[style=latex,escapeinside={(*@}{@*)}]{} +\usepackage[style=(*@$\langle$\normalfont\emph{style}$\rangle$@*)]{biblatex} \end{lstlisting} -The available styles are listet below. +The available styles are listed below. \begin{marglist} \item[trad-plain] Implementation of the standard style \sty{plain} \item[trad-unsrt] Implementation of the standard style \sty{unsrt} -\item[trad-alpha] \BiberOnlyMark Implementation of the standard style \sty{alpha} -\item[trad-abbrv] Implementation of the standard style \sty{abbrv} +\item[trad-alpha] Implementation of the standard style \sty{alpha} +\item[trad-abbrv] Implementation of the standard style \sty{abbrv} \end{marglist} -After loading the style you can use all options provided by the package \sty{biblatex}. +After loading the style you can use all options provided by \sty{biblatex}. +That means also that all fields of the standard bibliography drivers are available, +even if they are unknown to the traditional \texttt{.bst} files. -\section{Limitation} +\section{Limitations} -Up to know the entry types \bibtype{BOOK}, \bibtype{ARTICLE} and \bibtype{INCOLLECTION} are -setup. +Up to now the entry types \bibtype{article}, \bibtype{book}, \bibtype{incollection}, +\bibtype{inproceedings}, \bibtype{online}, \bibtype{proceedings}, \bibtype{thesis}, +\bibtype{report} and \bibtype{unpublished} are set up. -\section{Revision History} -\label{apx:log} +Since the styles are based on \sty{biblatex} standard styles, the fields retain the meaning +they have in \sty{biblatex} even if that may be at odds with how the traditional \sty{.bst} +files handle those fields. +\section{Revision History}\label{apx:log} \begin{changelog} +\begin{release}{0.3}{2016-06-26} +\item fix issues with new name formats in \sty{biblatex} versions $\geq$~3.3 (\gitissuelink{25}) +\item fix problems with the related mechanism (\gitissuelink{24}) +\item proper support for \bibtype{thesis}-types (\gitissuelink{23}) +\item modify \opt{maxalphanames}/\opt{minalphanames} and \cmd{labelalphaothers} in \sty{trad-alpha} to mirror \sty{alpha} more closely (\gitissuelink{22}) +\item use \bibfield{labelprefix} instead of \bibfield{prefixnumber} +\end{release} \begin{release}{0.2}{2012-09-29} \item fixed missing comma after journal name if journal name has a period @@ -141,9 +153,7 @@ \begin{release}{0.1}{2012-09-09} \item First upload \end{release} - \end{changelog} \end{document} \endinput - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-trad.doc.tlpobj new/tlpkg/tlpobj/biblatex-trad.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-trad.doc.tlpobj 2016-04-14 18:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-trad.doc.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,9 +1,9 @@ name biblatex-trad.doc category Package -revision 27852 +revision 41656 shortdesc doc files of biblatex-trad relocated 1 -docfiles size=63 - RELOC/doc/latex/biblatex-trad/README.txt +docfiles size=87 + RELOC/doc/latex/biblatex-trad/README.md RELOC/doc/latex/biblatex-trad/biblatex-trad.pdf RELOC/doc/latex/biblatex-trad/biblatex-trad.tex ++++++ biblatex-trad.tar.xz ++++++ ++++ 1860 lines of diff (skipped) ++++++ biblatex-true-citepages-omit.doc.tar.xz ++++++ Binary files old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.pdf and new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.tex new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.tex --- old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.tex 2016-11-25 19:28:17.000000000 +0100 @@ -0,0 +1,16 @@ +\documentclass{article} +\usepackage{fontspec} +\usepackage[citestyle=verbose-trad2,citepages=omit]{biblatex} +\usepackage{biblatex-source-division} +\usepackage{biblatex-true-citepages-omit} +\bibliography{example.bib} +\begin{document} + + + +\cite[\pno~125, sur ce point...]{Kaestli1993} + + +\cite[(1)\pno~795, sur ce point...]{Pleiade_Bar} + +\end{document} Binary files old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.pdf and new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.tex new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.tex --- old/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.tex 2015-01-13 23:19:40.000000000 +0100 +++ new/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.tex 2016-11-25 19:28:17.000000000 +0100 @@ -26,8 +26,8 @@ email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, title={The biblatex-true-citepages-omit package}, - revision={1.0.2a}, - date={12/01/2015}, + revision={1.3.0}, + date={21/09/2016}, url={https://github.com/maieul/biblatex-true-citepages-omit}} % Hyphen \hyphenation{Ma-de-lei-ne} @@ -115,6 +115,10 @@ \begin{changelog} +\begin{release}{1.3.0}{2015-09-21} + \item As in the standard citepages=omit, also clear the \bibfield{pagetotal} field. +\end{release} + \begin{release}{1.2.0}{2014-08-16} \item No more \cs{realcitepagesomitcmd} command. \item Internal macros with more consistent name. Binary files old/doc/latex/biblatex-true-citepages-omit/example.pdf and new/doc/latex/biblatex-true-citepages-omit/example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-true-citepages-omit/example.tex new/doc/latex/biblatex-true-citepages-omit/example.tex --- old/doc/latex/biblatex-true-citepages-omit/example.tex 2014-09-19 00:57:34.000000000 +0200 +++ new/doc/latex/biblatex-true-citepages-omit/example.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -\documentclass{article} -\usepackage{fontspec} -\usepackage[citestyle=verbose-trad2,citepages=omit]{biblatex} -\usepackage{biblatex-source-division} -\usepackage{biblatex-true-citepages-omit} -\bibliography{example.bib} -\begin{document} - - - -\cite[\pno~125, sur ce point...]{Kaestli1993} - - -\cite[(1)\pno~795, sur ce point...]{Pleiade_Bar} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-true-citepages-omit.doc.tlpobj new/tlpkg/tlpobj/biblatex-true-citepages-omit.doc.tlpobj --- old/tlpkg/tlpobj/biblatex-true-citepages-omit.doc.tlpobj 2016-04-14 18:42:26.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-true-citepages-omit.doc.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,15 +1,15 @@ name biblatex-true-citepages-omit.doc category Package -revision 36047 +revision 42120 shortdesc doc files of biblatex-true-citepages-omit relocated 1 -docfiles size=24 +docfiles size=26 RELOC/doc/latex/biblatex-true-citepages-omit/README + RELOC/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.pdf + RELOC/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit-example.tex RELOC/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.bib RELOC/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.pdf RELOC/doc/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.tex RELOC/doc/latex/biblatex-true-citepages-omit/example.bib - RELOC/doc/latex/biblatex-true-citepages-omit/example.pdf - RELOC/doc/latex/biblatex-true-citepages-omit/example.tex RELOC/doc/latex/biblatex-true-citepages-omit/latexmkrc RELOC/doc/latex/biblatex-true-citepages-omit/makefile ++++++ biblatex-true-citepages-omit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.sty new/tex/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.sty --- old/tex/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.sty 2015-01-13 23:19:40.000000000 +0100 +++ new/tex/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.sty 2016-11-25 19:33:43.000000000 +0100 @@ -15,7 +15,7 @@ % This work consists of the file biblatex-real-citepages-omit.sty \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-true-citepages-omit}[2015/12/01 v1.2.0a real run of citepages=omit for biblatex] +\ProvidesPackage{biblatex-true-citepages-omit}[2016/09/21 v1.3.0 real run of citepages=omit for biblatex]% \RequirePackage{xstring} \AtEveryCitekey{% @@ -24,11 +24,24 @@ \newbibmacro{true-citepages-omit}{% \iffieldundef{postnote}{}{% - \IfBeginWith{\noexpand\csfield{postnote}}{\pno}{\clearfield{pages}}{% - \IfBeginWith{\noexpand\csfield{postnote}}{\ppno}{\clearfield{pages}}{}}% + \IfBeginWith{\noexpand\csfield{postnote}}{\pno}% + {% + \usebibmacro{true-citepages-omit:clear}% + }{% + \IfBeginWith{\noexpand\csfield{postnote}}{\ppno}% + {% + \usebibmacro{true-citepages-omit:clear}% + }% + {% + }% + }% }% }% +\newbibmacro{true-citepages-omit:clear}{% + \clearfield{pages}% + \clearfield{pagetotal}% +}% %%% Kept for backward compatibility. No more needed. \newcommand{\realcitepagesomitcmd}[1]{\ifcsdef{#1}{\expandafter\robustify\csname#1\endcsname}{}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-true-citepages-omit.tlpobj new/tlpkg/tlpobj/biblatex-true-citepages-omit.tlpobj --- old/tlpkg/tlpobj/biblatex-true-citepages-omit.tlpobj 2016-04-14 18:42:26.000000000 +0200 +++ new/tlpkg/tlpobj/biblatex-true-citepages-omit.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,16 +1,16 @@ name biblatex-true-citepages-omit category Package -revision 36047 +revision 42120 shortdesc Correction of some limitation of the citepages=omit option of BibLaTeX styles relocated 1 longdesc This package deals with a limitation of the citepages=omit -longdesc option of the verbose family of biblatex citestyles. The option +longdesc option of the verbose family of BibLaTeX citestyles. The option longdesc works when you \cite[xx]{key}, but not when you \cite[\pno~xx, longdesc some text]{key}. The package corrects this problem. runfiles size=1 RELOC/tex/latex/biblatex-true-citepages-omit/biblatex-true-citepages-omit.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-true-citepages-omit -catalogue-date 2015-08-03 06:38:55 +0200 +catalogue-date 2016-09-21 19:55:32 +0200 catalogue-license lppl1.3 catalogue-topics biblio biblatex bugfix -catalogue-version 1.2.0a +catalogue-version 1.3.0 ++++++ biblatex.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-c/biblatex.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-c.new/biblatex.doc.tar.xz differ: char 26, line 1 ++++++ biblatex.tar.xz ++++++ ++++ 10536 lines of diff (skipped) ++++++ bibleref-french.doc.tar.xz ++++++ ++++++ bibleref-french.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-french.tlpobj new/tlpkg/tlpobj/bibleref-french.tlpobj --- old/tlpkg/tlpobj/bibleref-french.tlpobj 2016-04-14 18:42:27.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref-french.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=8 RELOC/tex/latex/bibleref-french/bibleref-french.sty catalogue-ctan /macros/latex/contrib/bibleref-french -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics theology catalogue-version 2.3.1 ++++++ bibleref-german.doc.tar.xz ++++++ ++++++ bibleref-german.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-german.tlpobj new/tlpkg/tlpobj/bibleref-german.tlpobj --- old/tlpkg/tlpobj/bibleref-german.tlpobj 2016-04-14 18:42:28.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref-german.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=17 RELOC/tex/latex/bibleref-german/bibleref-german.sty catalogue-ctan /macros/latex/contrib/bibleref-german -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics theology catalogue-version 1.0a ++++++ bibleref-lds.doc.tar.xz ++++++ ++++++ bibleref-lds.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-lds.tlpobj new/tlpkg/tlpobj/bibleref-lds.tlpobj --- old/tlpkg/tlpobj/bibleref-lds.tlpobj 2016-04-14 18:42:28.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref-lds.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/latex/bibleref-lds/bibleref-lds.sty catalogue-ctan /macros/latex/contrib/bibleref-lds -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics theology catalogue-version 1.0 ++++++ bibleref-mouth.doc.tar.xz ++++++ ++++++ bibleref-mouth.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-mouth.tlpobj new/tlpkg/tlpobj/bibleref-mouth.tlpobj --- old/tlpkg/tlpobj/bibleref-mouth.tlpobj 2016-04-14 18:42:28.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref-mouth.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/bibleref-mouth/bibleref-mouth.sty catalogue-also bibleref catalogue-ctan /macros/latex/contrib/bibleref-mouth -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics theology catalogue-version 1.0 ++++++ bibleref-parse.doc.tar.xz ++++++ ++++++ bibleref-parse.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-parse.tlpobj new/tlpkg/tlpobj/bibleref-parse.tlpobj --- old/tlpkg/tlpobj/bibleref-parse.tlpobj 2016-04-14 18:42:29.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref-parse.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=12 RELOC/tex/latex/bibleref-parse/bibleref-parse.sty catalogue-ctan /macros/latex/contrib/bibleref-parse -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics theology catalogue-version 1.1 ++++++ bibleref.doc.tar.xz ++++++ ++++ 2204 lines of diff (skipped) ++++++ bibleref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bibleref/bibleref-xidx.sty new/tex/latex/bibleref/bibleref-xidx.sty --- old/tex/latex/bibleref/bibleref-xidx.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/bibleref/bibleref-xidx.sty 2016-11-25 19:33:43.000000000 +0100 @@ -0,0 +1,283 @@ +%% +%% This is file `bibleref-xidx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bibleref.dtx (with options: `bibleref-xidx.sty,package') +%% +%% bibleref.dtx +%% Copyright 2011 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref-xidx.sty, bibleref.sty, sample-categories.tex, sample-indextools.tex, sample-xidx.tex, sample.tex, sample.ist. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{bibleref-xidx}[2011/01/19 v1.0 (NLCT) Extended indexing support for bibleref] +\newif\if@br@indexchapters +\@br@indexchapterstrue +\newif\if@br@indexverses +\@br@indexversestrue +\DeclareOption{verses}{\@br@indexchapterstrue\@br@indexversestrue} +\DeclareOption{noverses}{\@br@indexversesfalse} +\DeclareOption{chapters}{\@br@indexchaptersfalse} +\DeclareOption{nochapters}{\@br@indexchaptersfalse\@br@indexversesfalse} +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{bibleref}} +\ProcessOptions +\RequirePackage{bibleref} +\def\@bibleverse(#1:{% + \def\@bv@chidxsort{}% + \def\@bv@chidxentry{}% + \@br@chsty{#1}% + \@@bibleverse +} +\def\@bibleverser-(#1:{% + \def\@bv@chidxsort{}% + \def\@bv@chidxentry{}% + \@br@chsty{#1}% + \@@bibleverse +} +\def\@@bibleverse#1){% + \def\@bv@tmp{#1}% + \ifx\@bv@tmp\@empty + \@bvx@dochindex + \else + \BRchvsep + \@br@vrsty{#1}% + \fi + \new@ifnextchar(% + {\BRchsep\@bibleverse}% + {\new@ifnextchar-% + {\protect\BRvrsep\@bibleverser}% + {\@end@@bibleverse}% + }% +} +\newcommand*{\@brx@dochsep}{% + \@bvx@chdo{\protect\BRvsep}% +} +\renewcommand*{\@br@chsty}[1]{% + \let\@brx@chsep\@empty + \@for\@brx@thisch:=#1\do{% + \@bvx@dochindex + \@brx@chsep + \expandafter\@@br@chsty\@brx@thisch-\@nil\end + \let\@brx@chsep\@brx@dochsep + }% +} +\newcommand*{\@brx@dovssep}{% + \@bvx@vsdo{\protect\BRvsep}% +} +\renewcommand*{\@br@vrsty}[1]{% + \let\@brx@vssep\@empty + \@for\@brx@thisvs:=#1\do{% + \def\@bv@vsidxentry{}% + \def\@bv@vsidxsort{}% + \@brx@vssep + \expandafter\@@br@vrsty\@brx@thisvs-\@nil\end + \let\@brx@vssep\@brx@dovssep + \@bvx@dovsindex + }% +} +\def\@@br@vrsty#1-#2\end{% + \ifx\@nil#2\relax + \@do@verse{#1}% + \else + \@do@verserange{#1}#2% + \fi +} +\renewcommand{\@do@verse}[1]{% + \@nodo@verse{#1}% + \expandafter\@bvx@vsdo\expandafter{\@br@tmp}% + \@bv@addtovsidxsort{-000}% +} +\def\@@br@chsty#1-#2\end{% + \ifx\@nil#2\relax + \@do@chapter{#1}% + \else + \@do@chapterrange{#1}#2% + \fi +} +\newcommand{\@do@chapter}[1]{% + \@nodo@chapter{#1}% + \@bvx@chdo{\protect\BRchapterstyle{#1}}% + \@bv@addtochidxsort{-000}% +} +\renewcommand*{\@nodo@chapter}[1]{% + \ifnum0#1<10\relax + \@bv@setchidxsort{00#1}% + \else + \ifnum0#1<100\relax + \@bv@setchidxsort{0#1}% + \else + \@bv@setchidxsort{#1}% + \fi + \fi +} +\def\@do@chapterrange#1#2-\@nil{% + \@nodo@chapter{#1}% + \@bvx@chdo{\protect\BRchapterstyle{#1}}% + \@bv@addtochidxsort{-}% + \@bvx@chadddo{\protect\BRvrsep}% + \@nodo@chapter{#2}% + \@bvx@chadddo{\protect\BRchapterstyle{#2}}% +} +\renewcommand*{\@nodo@verse}[1]{% + \br@stripverse{#1}% + \ifnum\@br@versenum<10\relax + \@bv@addtovsidxsort{00#1}% + \else + \ifnum\@br@versenum<100\relax + \@bv@addtovsidxsort{0#1}% + \else + \@bv@addtovsidxsort{#1}% + \fi + \fi + \ifx\@br@versesuffix\@empty + \protected@edef\@br@tmp{% + \protect\BRversestyle{\@br@versenum}% + }% + \else + \protected@edef\@br@tmp{% + \protect\BRversestyle{\@br@versenum}% + \protect\BRversesuffixstyle{\@br@versesuffix}% + }% + \fi +} +\def\@do@verserange#1#2-\@nil{% + \@nodo@verse{#1}% + \expandafter\@bvx@vsdo\expandafter{\@br@tmp}% + \@bv@addtovsidxsort{-}% + \@bvx@vsadddo{\protect\BRvrsep}% + \@nodo@verse{#2}% + \expandafter\@bvx@vsadddo\expandafter{\@br@tmp}% +} +\newcommand*{\@bv@setvsidxsort}[1]{% +\if@bv@idx + \protected@edef\@bv@vsidxsort{#1}% +\fi +} +\newcommand*{\@bv@addtovsidxsort}[1]{% +\if@bv@idx + \@bv@tmpa={#1}% + \@bv@tmpb=\expandafter{\@bv@vsidxsort}% + \protected@edef\@bv@vsidxsort{\the\@bv@tmpb\the\@bv@tmpa}% +\fi +} +\newcommand*{\@bv@setvsidx}[1]{% +\if@bv@idx + \def\@bv@vsidxentry{#1}% +\fi +} +\newcommand*{\@bv@addtovsidx}[1]{% +\if@bv@idx + \@bv@tmpa={#1}% + \@bv@tmpb=\expandafter{\@bv@vsidxentry}% + \protected@edef\@bv@vsidxentry{\the\@bv@tmpb\the\@bv@tmpa}% +\fi +} +\newcommand*{\@bv@setchidx}[1]{% +\if@bv@idx + \def\@bv@chidxentry{#1}% +\fi +} +\newcommand*{\@bv@addtochidx}[1]{% +\if@bv@idx + \@bv@tmpa={#1}% + \@bv@tmpb=\expandafter{\@bv@chidxentry}% + \protected@edef\@bv@chidxentry{\the\@bv@tmpb\the\@bv@tmpa}% +\fi +} +\newcommand*{\@bv@setchidxsort}[1]{% +\if@bv@idx + \protected@edef\@bv@chidxsort{#1}% +\fi +} +\newcommand*{\@bvx@chdo}[1]{#1\@bv@setchidx{#1}} +\newcommand*{\@bvx@vsdo}[1]{#1\@bv@setvsidx{#1}} +\newcommand*{\@bvx@chadddo}[1]{#1\@bv@addtochidx{#1}} +\newcommand*{\@bvx@vsadddo}[1]{#1\@bv@addtovsidx{#1}} +\let\@bv@org@bible@verse\@bible@verse +\renewcommand*{\@bible@verse}{% + \def\@bv@chidxentry{}% + \@bv@org@bible@verse +} +\renewcommand*{\@end@@bibleverse}{% + \ifx\@bv@chidxentry\@empty + \@bvx@dobkindex + \else + \if@br@indexchapters + \else + \@bvx@dobkindex + \fi + \fi + \@bv@idxfalse + \@bv@restore +} +\newcommand*{\@bvx@dochindex}{% +\if@br@indexchapters + \ifx\@bv@chidxentry\@empty + \else + \if@bv@idx + \expandafter\@do@bibleref@map\@@bv@idxsort\relax + \@do@biblerefindex + {\@@bv@idxsort\relax @\@bv@mainidxentry + !\@bv@chidxsort @\@bv@chidxentry + |\@bv@idxpgformat}% + \fi + \fi +\fi +} +\newcommand*{\@bvx@dovsindex}{% +\if@br@indexverses + \ifx\@bv@vsidxentry\@empty + \else + \if@bv@idx + \expandafter\@do@bibleref@map\@@bv@idxsort\relax + \@do@biblerefindex + {\@@bv@idxsort\relax @\@bv@mainidxentry + !\@bv@chidxsort @\@bv@chidxentry + !\@bv@vsidxsort @\@bv@vsidxentry + |\@bv@idxpgformat}% + \fi + \fi +\else + \@bvx@dochindex +\fi +} + +\newcommand*{\@bvx@dobkindex}{% + \if@bv@idx + \expandafter\@do@bibleref@map\@@bv@idxsort\relax + \@do@biblerefindex + {\@@bv@idxsort\relax @\@bv@mainidxentry|\@bv@idxpgformat}% + \fi +} +\endinput +%% +%% End of file `bibleref-xidx.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bibleref/bibleref.sty new/tex/latex/bibleref/bibleref.sty --- old/tex/latex/bibleref/bibleref.sty 2011-01-23 02:07:05.000000000 +0100 +++ new/tex/latex/bibleref/bibleref.sty 2016-11-25 19:33:43.000000000 +0100 @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref-xidx.sty, bibleref.sty, sample-categories.tex, sample-multind.tex, sample-xidx.tex, sample.tex, sample.ist, bibleref.perl. +%% This work consists of the files bibleref.dtx and bibleref.ins and the derived files bibleref-xidx.sty, bibleref.sty, sample-categories.tex, sample-indextools.tex, sample-xidx.tex, sample.tex, sample.ist. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bibleref}[2011/01/19 1.14 (NLCT)] +\ProvidesPackage{bibleref}[2016/09/27 1.16 (NLCT and MR)] \RequirePackage{ifthen} \RequirePackage{fmtcount} \RequirePackage{amsgen} @@ -830,8 +830,14 @@ {\@end@@bibleverse}% } \def\@bibleverse(#1:{% - \@br@chsty{#1}% - \@@bibleverse + \def\@bv@tmp{#1}% + \ifx\@bv@tmp\@empty + \def\@bv@bvmacro{\@@bibleversenosep}% + \else + \@br@chsty{#1}% + \def\@bv@bvmacro{\@@bibleverse}% + \fi + \@bv@bvmacro } \def\@bibleverser-(#1:{% \def\@bv@tmp{#1}% @@ -863,6 +869,19 @@ {\@end@@bibleverse}% }% } +\def\@@bibleversenosep#1){% + \def\@bv@tmp{#1}% + \ifx\@bv@tmp\@empty + \else + \@br@vrsty{#1}% + \fi + \new@ifnextchar(% + {\@bv@do{\protect\BRchsep}\@bibleverse}% + {\new@ifnextchar-% + {\@bv@do{\protect\BRvrsep}\@bibleverser}% + {\@end@@bibleverse}% + }% +} \newcommand*{\@end@@bibleverse}{% \if@bv@idx \expandafter\@do@bibleref@map\@@bv@idxsort\relax @@ -871,8 +890,14 @@ \else \def\@bv@tmp{\@bv@mainidxentry!\@bv@chidxsort @\@bv@idxentry}% \fi - \@do@biblerefindex - {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}% + \edef\@bv@tmpc{\@bv@idxpgformat}%\@bv@tmpa and \@bv@tmpb are tokens + \ifx\@empty\@bv@tmpc% + \@do@biblerefindex% + {\@@bv@idxsort\relax @\@bv@tmp}% + \else% + \@do@biblerefindex% + {\@@bv@idxsort\relax @\@bv@tmp|\@bv@idxpgformat}% + \fi% \@bv@idxfalse \fi \@bv@restore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref.tlpobj new/tlpkg/tlpobj/bibleref.tlpobj --- old/tlpkg/tlpobj/bibleref.tlpobj 2016-04-14 18:42:26.000000000 +0200 +++ new/tlpkg/tlpobj/bibleref.tlpobj 2017-04-14 17:31:56.000000000 +0200 @@ -1,15 +1,16 @@ name bibleref category Package -revision 21145 +revision 42162 shortdesc Format bible citations relocated 1 longdesc The bibleref package offers consistent formatting of references longdesc to parts of the Christian bible, in a number of well-defined longdesc formats. -runfiles size=8 +runfiles size=10 + RELOC/tex/latex/bibleref/bibleref-xidx.sty RELOC/tex/latex/bibleref/bibleref.sty catalogue-ctan /macros/latex/contrib/bibleref -catalogue-date 2016-01-13 07:10:24 +0100 +catalogue-date 2016-09-27 15:50:17 +0200 catalogue-license lppl1.3 catalogue-topics theology -catalogue-version 1.14 +catalogue-version 1.16 ++++++ bibletext.doc.tar.xz ++++++ ++++++ bibletext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibletext.tlpobj new/tlpkg/tlpobj/bibletext.tlpobj --- old/tlpkg/tlpobj/bibletext.tlpobj 2016-04-14 18:42:29.000000000 +0200 +++ new/tlpkg/tlpobj/bibletext.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/bibletext/bibletext.sty catalogue-ctan /macros/latex/contrib/bibletext -catalogue-date 2016-02-24 05:09:02 +0100 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics theology catalogue-version 0.1 ++++++ biblist.doc.tar.xz ++++++ ++++++ biblist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblist.tlpobj new/tlpkg/tlpobj/biblist.tlpobj --- old/tlpkg/tlpobj/biblist.tlpobj 2016-04-14 18:42:29.000000000 +0200 +++ new/tlpkg/tlpobj/biblist.tlpobj 2017-04-14 17:31:57.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/biblist/biblist.sty catalogue-also listbib catalogue-ctan /macros/latex209/contrib/biblist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-util ++++++ bibtex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bibtex.1 new/texmf-dist/doc/man/man1/bibtex.1 --- old/texmf-dist/doc/man/man1/bibtex.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/bibtex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH BIBTEX 1 "16 June 2015" "bibtex 0.99d" "Web2C 2016" +.TH BIBTEX 1 "16 June 2015" "bibtex 0.99d" "Web2C 2017" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Binary files old/texmf-dist/doc/man/man1/bibtex.man1.pdf and new/texmf-dist/doc/man/man1/bibtex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/bibtex/apalike.sty new/texmf-dist/tex/generic/bibtex/apalike.sty --- old/texmf-dist/tex/generic/bibtex/apalike.sty 2010-12-14 02:20:07.000000000 +0100 +++ new/texmf-dist/tex/generic/bibtex/apalike.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -% apalike.sty style, used in conjunction with apalike.bst, -% will produce an apa-like bibliography style. -% -% Copyright (C) 1986, 1987, 2010 Oren Patashnik. -% Unlimited copying and redistribution of this file are permitted as long as -% it is unmodified. Modifications (and redistribution of modified versions) -% are also permitted, but only if the resulting file is renamed. -% -% 1) Bibliography entries formatted alphabetically, last name -% first, each entry having a hanging indentation and no label. -% 2) References in the following formats: -% (Author, 1986) -% (Author and Author, 1986) -% (Author et al., 1986). -% 3) Multiple references in the form (Author1, 1986; Author2, 1987) -% -% To be used as an optional argument to the \documentstyle command; for example -% \documentstyle[11pt,apalike]{book} -% -% History: -% 16-Sep-86, original version by Oren Patashnik, ideas from Susan King. -% 13-Oct-87 changes: -% Fixed bug in last line by adding the {} that disappeard when -% the \hbox{} was removed from the pre-APALIKE definition; -% added club and widow penalties; -% patched the \newblock LaTeX bug from `-.07em' to simply `.07em'; -% and made this work for document styles that don't define `chapter'. -% Undated changes by Karl Berry and/or Oren Patashnik: -% 1) use \refname and \bibname instead of hardwiring -% the strings "References" and "Bibliography"; this change was first -% made in the apalike.sty in the germbib package. -% 2) do not define \bibhang if it is already defined. -% Karl Berry contributes his changes to the public domain. -% 8-Dec-10, clarify license. - -% Use parens instead of brackets for \cite, and no label in the bibliography -% -\def\@cite#1#2{(#1\if@tempswa , #2\fi)} -\def\@biblabel#1{} - -% Set length of hanging indentation for bibliography entries -% -\ifx\bibhang\@thisisundefined \newlength{\bibhang} \fi -\setlength{\bibhang}{2em} - -% \thebibliography environment depends on whether or not `chapter's can exist -% -\@ifundefined{chapter}{\def\thebibliography#1{\section*{\refname\@mkboth - {\sl\uppercase{\refname}}{\sl\uppercase{\refname}}}\list - {\relax}{\setlength{\labelsep}{0em} - \setlength{\itemindent}{-\bibhang} - \setlength{\leftmargin}{\bibhang}} - \def\newblock{\hskip .11em plus .33em minus .07em} - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax}}% -{\def\thebibliography#1{\chapter*{\bibname\@mkboth - {\sl\uppercase{\bibname}}{\sl\uppercase{\bibname}}}\list - {\relax}{\setlength{\labelsep}{0em} - \setlength{\itemindent}{-\bibhang} - \setlength{\leftmargin}{\bibhang}} - \def\newblock{\hskip .11em plus .33em minus .07em} - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax}} - -% `; ' goes between cites, and there's no \hbox around individual cites -% -\def\@citex[#1]#2{\if@filesw\immediate\write\@auxout{\string\citation{#2}}\fi - \def\@citea{}\@cite{\@for\@citeb:=#2\do - {\@citea\def\@citea{; }\@ifundefined - {b@\@citeb}{{\bf ?}\@warning - {Citation `\@citeb' on page \thepage \space undefined}}% -{\csname b@\@citeb\endcsname}}}{#1}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/bibtex/apalike.tex new/texmf-dist/tex/generic/bibtex/apalike.tex --- old/texmf-dist/tex/generic/bibtex/apalike.tex 2010-12-14 02:20:07.000000000 +0100 +++ new/texmf-dist/tex/generic/bibtex/apalike.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -% apalike.tex, version 0.99b (8-Dec-10), for btxmac 0.99i, BibTeX 0.99c, -% TeX 3.0 or later. -% -% Copyright (C) 1990, 1991, 1992, 2010 Oren Patashnik. -% Unlimited copying and redistribution of this file are permitted as long as -% it is unmodified. Modifications (and redistribution of modified versions) -% are also permitted, but only if the resulting file is renamed. -% -% This file, apalike.tex, contains TeX macros that let you use the -% apalike bibliography style with plain TeX. In essence, this file -% provides the TeX counterpart to apalike.sty, the LaTeX style file -% required for using the apalike bibliography style. Please report any -% bugs (outright goofs, misfeatures, or unclear documentation) to -% biblio(a)tug.org. These macros will become frozen -% shortly after BibTeX version 1.00 is released. -% -% AMS-TEX WARNING: This style (apalike) doesn't work with AmS-TeX's -% `amsppt' style, because AmS-TeX redefines the tie character `~' of -% plain TeX, and the `amsppt' style redefines plain TeX's `\nobreak' -% macro, so that a multiple-author reference for which `apalike' -% automatically produces an in-text citation like `(Jones et~al., 1992)' -% will throw AmS-TeX's `amsppt' style into an infinite loop, exceeding -% its input stack size. (I've checked no other AmS-TeX styles for this -% problem.) The AmS-TeX warning of btxmac.tex gives more information. -% END OF AMS-TEX WARNING. -% -% Editorial note (i.e., flame): -% Many journals require a style like `apalike', but I recommend that you -% not use it if you have a choice---use something like `plain' instead. -% Mary-Claire van Leunen (A Handbook for Scholars, Knopf, 1979) argues -% convincingly that a style like `plain' encourages better writing than -% one like `apalike'. Furthermore the best argument for using an -% author-date style like `apalike'---that it's "the most practical" -% (The Chicago Manual of Style, University of Chicago Press, thirteenth -% edition, 1982, pages 400--401)---falls flat on its face with the new -% computer-typesetting technology. For instance page 401 of the Chicago -% Manual anachronistically states "The chief disadvantage of [a style -% like `plain'] is that additions or deletions cannot be made after the -% manuscript is typed without changing numbers in both text references -% and list." With (La)TeX the disadvantage obviously evaporates. -% Moreover, apalike indulges in what I think is a shortsighted practice: -% automatically abbreviating first names. Abbreviating may occasionally -% make the work a page shorter, but at the cost of a less useful -% reference list; that's too high a cost for such a marginal benefit. -% The offense isn't egregious for a name like `Donald E. Knuth'---at -% least among those familiar with his field---since there aren't many -% other `D. E. Knuth's floating around. But referring to `D. E. Smith' -% in a field having more than one can be quite confusing. Moreover, -% with the proliferation of computers and citation indexes nowadays, -% it's important to indicate in the reference list an author's name -% exactly as it appears in the work cited. Automatically abbreviating -% first names is simply bad scholarship. (End of flame.) -% -% To use these macros you need the btxmac.tex macros, which let you use -% BibTeX with plain TeX (rather than with LaTeX); the file btxmac.tex -% explains those macros in detail, and gives examples. You simply -% \input apalike right after you \input btxmac to invoke these macros. -% -% -% HISTORY -% -% Oren Patashnik wrote the original version of these macros in December -% 1990, for use with btxmac.tex. -% -% 12-Dec-90 Version 0.99a, first general release. -% 29-Feb-92 0.99b, changed `\biblabelextrahang' to `\biblabelextraspace', -% to keep up with btxmac.tex version 0.99i. -% 8-Dec-10 Still version 0.99b, as the code itself was unchanged; -% this release clarified the license. -% -% Here, finally (I swear, I thought he was never gonna stop), are the -% macros. The first bunch makes the label empty and sets 2em of -% hanging indentation (via \biblabelextraspace) for each entry. -% -\def\biblabelprint#1{\noindent}% -\def\biblabelcontents#1{}% -\def\bblhook{\biblabelextraspace = 2em }% -% -% -% And the last bunch formats an in-text citation: parens around the -% entire citation; semicolons separating individual references; and a -% comma between a reference and its note (like `page 41') if it exists. -% -\def\printcitestart{(}% left paren -\def\printcitefinish{)}% right parent -\def\printbetweencitations{; }% semicolon, space -\def\printcitenote#1{, #1}% comma, space, note (if it exists) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex.doc.tlpobj new/tlpkg/tlpobj/bibtex.doc.tlpobj --- old/tlpkg/tlpobj/bibtex.doc.tlpobj 2016-04-27 03:14:36.000000000 +0200 +++ new/tlpkg/tlpobj/bibtex.doc.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,8 +1,8 @@ name bibtex.doc category Package -revision 40768 +revision 44166 shortdesc doc files of bibtex -docfiles size=136 +docfiles size=129 texmf-dist/doc/bibtex/base/README texmf-dist/doc/bibtex/base/btxbst.doc texmf-dist/doc/bibtex/base/btxdoc.bib @@ -12,5 +12,3 @@ texmf-dist/doc/bibtex/base/btxhak.tex texmf-dist/doc/man/man1/bibtex.1 texmf-dist/doc/man/man1/bibtex.man1.pdf - texmf-dist/tex/generic/bibtex/apalike.sty - texmf-dist/tex/generic/bibtex/apalike.tex ++++++ bibtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/bibtex/apalike.sty new/texmf-dist/tex/generic/bibtex/apalike.sty --- old/texmf-dist/tex/generic/bibtex/apalike.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/tex/generic/bibtex/apalike.sty 2016-11-25 19:33:32.000000000 +0100 @@ -0,0 +1,72 @@ +% apalike.sty style, used in conjunction with apalike.bst, +% will produce an apa-like bibliography style. +% +% Copyright (C) 1986, 1987, 2010 Oren Patashnik. +% Unlimited copying and redistribution of this file are permitted as long as +% it is unmodified. Modifications (and redistribution of modified versions) +% are also permitted, but only if the resulting file is renamed. +% +% 1) Bibliography entries formatted alphabetically, last name +% first, each entry having a hanging indentation and no label. +% 2) References in the following formats: +% (Author, 1986) +% (Author and Author, 1986) +% (Author et al., 1986). +% 3) Multiple references in the form (Author1, 1986; Author2, 1987) +% +% To be used as an optional argument to the \documentstyle command; for example +% \documentstyle[11pt,apalike]{book} +% +% History: +% 16-Sep-86, original version by Oren Patashnik, ideas from Susan King. +% 13-Oct-87 changes: +% Fixed bug in last line by adding the {} that disappeard when +% the \hbox{} was removed from the pre-APALIKE definition; +% added club and widow penalties; +% patched the \newblock LaTeX bug from `-.07em' to simply `.07em'; +% and made this work for document styles that don't define `chapter'. +% Undated changes by Karl Berry and/or Oren Patashnik: +% 1) use \refname and \bibname instead of hardwiring +% the strings "References" and "Bibliography"; this change was first +% made in the apalike.sty in the germbib package. +% 2) do not define \bibhang if it is already defined. +% Karl Berry contributes his changes to the public domain. +% 8-Dec-10, clarify license. + +% Use parens instead of brackets for \cite, and no label in the bibliography +% +\def\@cite#1#2{(#1\if@tempswa , #2\fi)} +\def\@biblabel#1{} + +% Set length of hanging indentation for bibliography entries +% +\ifx\bibhang\@thisisundefined \newlength{\bibhang} \fi +\setlength{\bibhang}{2em} + +% \thebibliography environment depends on whether or not `chapter's can exist +% +\@ifundefined{chapter}{\def\thebibliography#1{\section*{\refname\@mkboth + {\sl\uppercase{\refname}}{\sl\uppercase{\refname}}}\list + {\relax}{\setlength{\labelsep}{0em} + \setlength{\itemindent}{-\bibhang} + \setlength{\leftmargin}{\bibhang}} + \def\newblock{\hskip .11em plus .33em minus .07em} + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.=1000\relax}}% +{\def\thebibliography#1{\chapter*{\bibname\@mkboth + {\sl\uppercase{\bibname}}{\sl\uppercase{\bibname}}}\list + {\relax}{\setlength{\labelsep}{0em} + \setlength{\itemindent}{-\bibhang} + \setlength{\leftmargin}{\bibhang}} + \def\newblock{\hskip .11em plus .33em minus .07em} + \sloppy\clubpenalty4000\widowpenalty4000 + \sfcode`\.=1000\relax}} + +% `; ' goes between cites, and there's no \hbox around individual cites +% +\def\@citex[#1]#2{\if@filesw\immediate\write\@auxout{\string\citation{#2}}\fi + \def\@citea{}\@cite{\@for\@citeb:=#2\do + {\@citea\def\@citea{; }\@ifundefined + {b@\@citeb}{{\bf ?}\@warning + {Citation `\@citeb' on page \thepage \space undefined}}% +{\csname b@\@citeb\endcsname}}}{#1}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/bibtex/apalike.tex new/texmf-dist/tex/generic/bibtex/apalike.tex --- old/texmf-dist/tex/generic/bibtex/apalike.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/tex/generic/bibtex/apalike.tex 2016-11-25 19:33:32.000000000 +0100 @@ -0,0 +1,87 @@ +% apalike.tex, version 0.99b (8-Dec-10), for btxmac 0.99i, BibTeX 0.99c, +% TeX 3.0 or later. +% +% Copyright (C) 1990, 1991, 1992, 2010 Oren Patashnik. +% Unlimited copying and redistribution of this file are permitted as long as +% it is unmodified. Modifications (and redistribution of modified versions) +% are also permitted, but only if the resulting file is renamed. +% +% This file, apalike.tex, contains TeX macros that let you use the +% apalike bibliography style with plain TeX. In essence, this file +% provides the TeX counterpart to apalike.sty, the LaTeX style file +% required for using the apalike bibliography style. Please report any +% bugs (outright goofs, misfeatures, or unclear documentation) to +% biblio(a)tug.org. These macros will become frozen +% shortly after BibTeX version 1.00 is released. +% +% AMS-TEX WARNING: This style (apalike) doesn't work with AmS-TeX's +% `amsppt' style, because AmS-TeX redefines the tie character `~' of +% plain TeX, and the `amsppt' style redefines plain TeX's `\nobreak' +% macro, so that a multiple-author reference for which `apalike' +% automatically produces an in-text citation like `(Jones et~al., 1992)' +% will throw AmS-TeX's `amsppt' style into an infinite loop, exceeding +% its input stack size. (I've checked no other AmS-TeX styles for this +% problem.) The AmS-TeX warning of btxmac.tex gives more information. +% END OF AMS-TEX WARNING. +% +% Editorial note (i.e., flame): +% Many journals require a style like `apalike', but I recommend that you +% not use it if you have a choice---use something like `plain' instead. +% Mary-Claire van Leunen (A Handbook for Scholars, Knopf, 1979) argues +% convincingly that a style like `plain' encourages better writing than +% one like `apalike'. Furthermore the best argument for using an +% author-date style like `apalike'---that it's "the most practical" +% (The Chicago Manual of Style, University of Chicago Press, thirteenth +% edition, 1982, pages 400--401)---falls flat on its face with the new +% computer-typesetting technology. For instance page 401 of the Chicago +% Manual anachronistically states "The chief disadvantage of [a style +% like `plain'] is that additions or deletions cannot be made after the +% manuscript is typed without changing numbers in both text references +% and list." With (La)TeX the disadvantage obviously evaporates. +% Moreover, apalike indulges in what I think is a shortsighted practice: +% automatically abbreviating first names. Abbreviating may occasionally +% make the work a page shorter, but at the cost of a less useful +% reference list; that's too high a cost for such a marginal benefit. +% The offense isn't egregious for a name like `Donald E. Knuth'---at +% least among those familiar with his field---since there aren't many +% other `D. E. Knuth's floating around. But referring to `D. E. Smith' +% in a field having more than one can be quite confusing. Moreover, +% with the proliferation of computers and citation indexes nowadays, +% it's important to indicate in the reference list an author's name +% exactly as it appears in the work cited. Automatically abbreviating +% first names is simply bad scholarship. (End of flame.) +% +% To use these macros you need the btxmac.tex macros, which let you use +% BibTeX with plain TeX (rather than with LaTeX); the file btxmac.tex +% explains those macros in detail, and gives examples. You simply +% \input apalike right after you \input btxmac to invoke these macros. +% +% +% HISTORY +% +% Oren Patashnik wrote the original version of these macros in December +% 1990, for use with btxmac.tex. +% +% 12-Dec-90 Version 0.99a, first general release. +% 29-Feb-92 0.99b, changed `\biblabelextrahang' to `\biblabelextraspace', +% to keep up with btxmac.tex version 0.99i. +% 8-Dec-10 Still version 0.99b, as the code itself was unchanged; +% this release clarified the license. +% +% Here, finally (I swear, I thought he was never gonna stop), are the +% macros. The first bunch makes the label empty and sets 2em of +% hanging indentation (via \biblabelextraspace) for each entry. +% +\def\biblabelprint#1{\noindent}% +\def\biblabelcontents#1{}% +\def\bblhook{\biblabelextraspace = 2em }% +% +% +% And the last bunch formats an in-text citation: parens around the +% entire citation; semicolons separating individual references; and a +% comma between a reference and its note (like `page 41') if it exists. +% +\def\printcitestart{(}% left paren +\def\printcitefinish{)}% right parent +\def\printbetweencitations{; }% semicolon, space +\def\printcitenote#1{, #1}% comma, space, note (if it exists) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex.tlpobj new/tlpkg/tlpobj/bibtex.tlpobj --- old/tlpkg/tlpobj/bibtex.tlpobj 2016-04-27 03:14:37.000000000 +0200 +++ new/tlpkg/tlpobj/bibtex.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,6 +1,6 @@ name bibtex category Package -revision 40768 +revision 44166 shortdesc Process bibliographies for LaTeX, etc longdesc BibTeX allows the user to store his citation data in generic longdesc form, while printing citations in a document in the form @@ -12,12 +12,12 @@ longdesc from simple ASCII (for example, in the various national sorting longdesc rules for languages expressed in different parts of ISO-8859 -- longdesc the "ISO Latin" series). For more flexibility, the user is -longdesc urged to consider using biber with biblatex to typeset its +longdesc urged to consider using biber with BibLaTeX to typeset its longdesc output. In fact, it is best to avoid BibTeX in favour of biber longdesc and BibLaTeX, if at all possible. depend kpathsea depend bibtex.ARCH -runfiles size=48 +runfiles size=51 texmf-dist/bibtex/bib/base/xampl.bib texmf-dist/bibtex/bst/base/abbrv.bst texmf-dist/bibtex/bst/base/acm.bst @@ -27,8 +27,10 @@ texmf-dist/bibtex/bst/base/plain.bst texmf-dist/bibtex/bst/base/siam.bst texmf-dist/bibtex/bst/base/unsrt.bst + texmf-dist/tex/generic/bibtex/apalike.sty + texmf-dist/tex/generic/bibtex/apalike.tex catalogue-ctan /biblio/bibtex/base -catalogue-date 2015-08-08 20:43:44 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license knuth catalogue-topics biblio catalogue-version 0.99d ++++++ bibtex8.doc.tar.xz ++++++ ++++++ bibtex8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex8.tlpobj new/tlpkg/tlpobj/bibtex8.tlpobj --- old/tlpkg/tlpobj/bibtex8.tlpobj 2016-04-14 18:42:33.000000000 +0200 +++ new/tlpkg/tlpobj/bibtex8.tlpobj 2017-04-14 17:31:59.000000000 +0200 @@ -24,7 +24,7 @@ texmf-dist/bibtex/csf/polish-csf/cp852pl.csf texmf-dist/bibtex/csf/polish-csf/iso8859-7.csf catalogue-ctan /biblio/bibtex/8-bit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics biblio catalogue-version 3.71 ++++++ bibtexperllibs.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/bibtexperllibs/BibTeXParser.3pm new/doc/support/bibtexperllibs/BibTeXParser.3pm --- old/doc/support/bibtexperllibs/BibTeXParser.3pm 2016-03-25 23:06:44.000000000 +0100 +++ new/doc/support/bibtexperllibs/BibTeXParser.3pm 2017-03-20 00:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BibTeX::Parser 3pm" -.TH BibTeX::Parser 3pm "2016-03-24" "perl v5.10.1" "User Contributed Perl Documentation" +.TH BibTeX::Parser 3pm "2017-03-18" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -191,7 +200,7 @@ BibTeX::Parser::Author .SH "VERSION" .IX Header "VERSION" -version 0.69 +version 1.00 .SH "AUTHOR" .IX Header "AUTHOR" Gerhard Gossen <gerhard.gossen(a)googlemail.com> and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/bibtexperllibs/BibTeXParserAuthor.3pm new/doc/support/bibtexperllibs/BibTeXParserAuthor.3pm --- old/doc/support/bibtexperllibs/BibTeXParserAuthor.3pm 2016-03-25 23:06:44.000000000 +0100 +++ new/doc/support/bibtexperllibs/BibTeXParserAuthor.3pm 2017-03-20 00:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BibTeX::Parser::Author 3pm" -.TH BibTeX::Parser::Author 3pm "2016-03-24" "perl v5.10.1" "User Contributed Perl Documentation" +.TH BibTeX::Parser::Author 3pm "2017-03-18" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -194,7 +203,7 @@ the following token is not: \f(CW\*(C`{von}\*(C'\fR .SH "VERSION" .IX Header "VERSION" -version 0.69 +version 1.00 .SH "AUTHOR" .IX Header "AUTHOR" Gerhard Gossen <gerhard.gossen(a)googlemail.com> and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/bibtexperllibs/BibTeXParserEntry.3pm new/doc/support/bibtexperllibs/BibTeXParserEntry.3pm --- old/doc/support/bibtexperllibs/BibTeXParserEntry.3pm 2016-03-25 23:06:44.000000000 +0100 +++ new/doc/support/bibtexperllibs/BibTeXParserEntry.3pm 2017-03-20 00:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BibTeX::Parser::Entry 3pm" -.TH BibTeX::Parser::Entry 3pm "2016-03-24" "perl v5.10.1" "User Contributed Perl Documentation" +.TH BibTeX::Parser::Entry 3pm "2017-03-18" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -219,7 +228,7 @@ \&\f(CW\*(C`$entry\->to_string(canonize_names=>0)\*(C'\fR overrides this behavior. .SH "VERSION" .IX Header "VERSION" -version 0.69 +version 1.00 .SH "AUTHOR" .IX Header "AUTHOR" Gerhard Gossen <gerhard.gossen(a)googlemail.com> and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/bibtexperllibs/LaTeXToUnicode.3pm new/doc/support/bibtexperllibs/LaTeXToUnicode.3pm --- old/doc/support/bibtexperllibs/LaTeXToUnicode.3pm 2016-03-25 23:06:44.000000000 +0100 +++ new/doc/support/bibtexperllibs/LaTeXToUnicode.3pm 2016-11-25 19:30:46.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LaTeX::ToUnicode 3pm" -.TH LaTeX::ToUnicode 3pm "2015-12-28" "perl v5.10.1" "User Contributed Perl Documentation" +.TH LaTeX::ToUnicode 3pm "2016-11-22" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,7 +142,7 @@ LaTeX::ToUnicode \- Convert LaTeX commands to Unicode .SH "VERSION" .IX Header "VERSION" -version 0.04 +version 0.05 .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 1 @@ -150,7 +159,7 @@ or accents into their Unicode equivalents and removes formatting commands. .PP I use this module to convert values from BibTeX files into plain text, if your -use case is different, \s-1YMMV\s0. +use case is different, \s-1YMMV.\s0 .PP In contrast to TeX::Encode, this module does not create \s-1HTML\s0 of any kind. .SH "FUNCTIONS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/bibtexperllibs/LaTeXToUnicodeTables.3pm new/doc/support/bibtexperllibs/LaTeXToUnicodeTables.3pm --- old/doc/support/bibtexperllibs/LaTeXToUnicodeTables.3pm 2016-03-25 23:06:44.000000000 +0100 +++ new/doc/support/bibtexperllibs/LaTeXToUnicodeTables.3pm 2016-11-25 19:30:46.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LaTeX::ToUnicode::Tables 3pm" -.TH LaTeX::ToUnicode::Tables 3pm "2015-12-28" "perl v5.10.1" "User Contributed Perl Documentation" +.TH LaTeX::ToUnicode::Tables 3pm "2016-11-22" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,7 +142,7 @@ LaTeX::ToUnicode::Tables \- Character tables for LaTeX::ToUnicode .SH "VERSION" .IX Header "VERSION" -version 0.04 +version 0.05 .SH "CONSTANTS" .IX Header "CONSTANTS" .ie n .SS "%COMMANDS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj new/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj --- old/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj 2016-04-14 18:42:39.000000000 +0200 +++ new/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj 2017-04-14 17:32:01.000000000 +0200 @@ -1,6 +1,6 @@ name bibtexperllibs.doc category Package -revision 40139 +revision 43549 shortdesc doc files of bibtexperllibs relocated 1 docfiles size=10 ++++++ bibtexperllibs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/bibtexperllibs/BibTeX/Parser/Author.pm new/scripts/bibtexperllibs/BibTeX/Parser/Author.pm --- old/scripts/bibtexperllibs/BibTeX/Parser/Author.pm 2016-03-25 23:06:44.000000000 +0100 +++ new/scripts/bibtexperllibs/BibTeX/Parser/Author.pm 2017-03-20 00:01:07.000000000 +0100 @@ -1,6 +1,6 @@ package BibTeX::Parser::Author; { - $BibTeX::Parser::Author::VERSION = '0.69'; + $BibTeX::Parser::Author::VERSION = '1.00'; } use warnings; @@ -393,7 +393,7 @@ =head1 VERSION -version 0.69 +version 1.00 =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm new/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm --- old/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm 2016-03-25 23:06:44.000000000 +0100 +++ new/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm 2017-03-20 00:01:07.000000000 +0100 @@ -1,6 +1,6 @@ package BibTeX::Parser::Entry; { - $BibTeX::Parser::Entry::VERSION = '0.69'; + $BibTeX::Parser::Entry::VERSION = '1.00'; } use warnings; @@ -234,7 +234,7 @@ $value = join(' and ', @names); } if ($field eq 'editor' && $options{canonize_names}) { - my @names = ($self->editors); + my @names = ($self->editor); $value = join(' and ', @names); } $result .= " $field = {"."$value"."},\n"; @@ -357,7 +357,7 @@ =head1 VERSION -version 0.69 +version 1.00 =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/bibtexperllibs/BibTeX/Parser.pm new/scripts/bibtexperllibs/BibTeX/Parser.pm --- old/scripts/bibtexperllibs/BibTeX/Parser.pm 2016-03-25 23:06:44.000000000 +0100 +++ new/scripts/bibtexperllibs/BibTeX/Parser.pm 2017-03-20 00:01:07.000000000 +0100 @@ -1,6 +1,6 @@ package BibTeX::Parser; { - $BibTeX::Parser::VERSION = '0.69'; + $BibTeX::Parser::VERSION = '1.00'; } # ABSTRACT: A pure perl BibTeX parser use warnings; @@ -84,7 +84,7 @@ pos($_) = $pos; if ( $type eq "STRING" ) { - if (/\G{\s*($re_name)\s*=\s*/cgo) { + if (/\G\{\s*($re_name)\s*=\s*/cgo) { my $key = $1; my $value = _parse_string( $self->{strings} ); if ( defined $self->{strings}->{$key} ) { @@ -337,7 +337,7 @@ =head1 VERSION -version 0.69 +version 1.00 =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm new/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm --- old/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm 2016-03-11 00:22:31.000000000 +0100 +++ new/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm 2016-11-25 19:32:52.000000000 +0100 @@ -1,6 +1,6 @@ package LaTeX::ToUnicode::Tables; BEGIN { - $LaTeX::ToUnicode::Tables::VERSION = '0.04'; + $LaTeX::ToUnicode::Tables::VERSION = '0.05'; } use strict; use warnings; @@ -459,7 +459,7 @@ =head1 VERSION -version 0.04 +version 0.05 =head1 CONSTANTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/bibtexperllibs/LaTeX/ToUnicode.pm new/scripts/bibtexperllibs/LaTeX/ToUnicode.pm --- old/scripts/bibtexperllibs/LaTeX/ToUnicode.pm 2016-03-11 00:22:31.000000000 +0100 +++ new/scripts/bibtexperllibs/LaTeX/ToUnicode.pm 2016-11-25 19:32:52.000000000 +0100 @@ -2,7 +2,7 @@ use warnings; package LaTeX::ToUnicode; BEGIN { - $LaTeX::ToUnicode::VERSION = '0.04'; + $LaTeX::ToUnicode::VERSION = '0.05'; } #ABSTRACT: Convert LaTeX commands to Unicode @@ -29,10 +29,10 @@ sub _convert_accents { my $string = shift; - $string =~ s/({\\(.){(\\?\w{1,2})}})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"{a}} - $string =~ s/({\\(.)(\\?\w{1,2})})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"a} + $string =~ s/(\{\\(.)\{(\\?\w{1,2})\}\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"{a}} + $string =~ s/(\{\\(.)(\\?\w{1,2})\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"a} $string =~ s/(\\(.)(\\?\w{1,2}))/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"a - $string =~ s/(\\(.){(\\?\w{1,2})})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"{a} + $string =~ s/(\\(.)\{(\\?\w{1,2})\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"{a} $string; } @@ -49,7 +49,7 @@ my $string = shift; foreach my $command ( keys %LaTeX::ToUnicode::Tables::COMMANDS ) { - $string =~ s/{\\$command}/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g; + $string =~ s/\{\\$command\}/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g; $string =~ s/\\$command(?=\s|\b)/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g; } @@ -79,8 +79,8 @@ my $string = shift; my $markups = join( '|', @LaTeX::ToUnicode::Tables::MARKUPS ); - $string =~ s/({[^{}]+)\\(?:$markups)\s+([^{}]+})/$1$2/g; # { ... \command ... } - my $pattern = qr/{\\(?:$markups)\s+([^{}]*)}/o; + $string =~ s/(\{[^{}]+)\\(?:$markups)\s+([^{}]+\})/$1$2/g; # { ... \command ... } + my $pattern = qr/\{\\(?:$markups)\s+([^{}]*)\}/o; $string =~ s/$pattern/$1/g; $string =~ s/``/“/g; @@ -103,7 +103,7 @@ =head1 VERSION -version 0.04 +version 0.05 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtexperllibs.tlpobj new/tlpkg/tlpobj/bibtexperllibs.tlpobj --- old/tlpkg/tlpobj/bibtexperllibs.tlpobj 2016-04-14 18:42:39.000000000 +0200 +++ new/tlpkg/tlpobj/bibtexperllibs.tlpobj 2017-04-14 17:32:01.000000000 +0200 @@ -1,6 +1,6 @@ name bibtexperllibs category Package -revision 40139 +revision 43549 shortdesc BibTeX Perl Libraries relocated 1 longdesc This package provides BibTeX related Perl libraries by Gerhard @@ -16,7 +16,7 @@ RELOC/scripts/bibtexperllibs/LaTeX/ToUnicode.pm RELOC/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm catalogue-ctan /support/bibtexperllibs -catalogue-date 2016-03-25 05:20:48 +0100 +catalogue-date 2017-03-19 21:15:40 +0100 catalogue-license gpl catalogue-topics bibtex-supp -catalogue-version 1.1 +catalogue-version 1.3 ++++++ bibtexu.doc.tar.xz ++++++ ++++++ bibtopic.doc.tar.xz ++++++ ++++++ bibtopic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtopic.tlpobj new/tlpkg/tlpobj/bibtopic.tlpobj --- old/tlpkg/tlpobj/bibtopic.tlpobj 2016-04-14 18:47:22.000000000 +0200 +++ new/tlpkg/tlpobj/bibtopic.tlpobj 2017-04-14 17:33:53.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=9 RELOC/tex/latex/bibtopic/bibtopic.sty catalogue-ctan /macros/latex/contrib/bibtopic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-multi bibtex-supp catalogue-version 1.1a ++++++ bibtopicprefix.doc.tar.xz ++++++ ++++++ bibtopicprefix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtopicprefix.tlpobj new/tlpkg/tlpobj/bibtopicprefix.tlpobj --- old/tlpkg/tlpobj/bibtopicprefix.tlpobj 2016-04-14 18:47:22.000000000 +0200 +++ new/tlpkg/tlpobj/bibtopicprefix.tlpobj 2017-04-14 17:33:53.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/bibtopicprefix/bibtopicprefix.sty catalogue-ctan /macros/latex/contrib/bibtopicprefix -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-multi bibtex-supp catalogue-version 1.10 ++++++ bibunits.doc.tar.xz ++++++ ++++++ bibunits.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibunits.tlpobj new/tlpkg/tlpobj/bibunits.tlpobj --- old/tlpkg/tlpobj/bibunits.tlpobj 2016-04-14 18:47:23.000000000 +0200 +++ new/tlpkg/tlpobj/bibunits.tlpobj 2017-04-14 17:33:53.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/bibunits/bibunits.sty catalogue-also bibtopic chapterbib catalogue-ctan /macros/latex/contrib/bibunits -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-multi bibtex-supp catalogue-version 2.2 ++++++ bidi-atbegshi.doc.tar.xz ++++++ ++++++ bidi-atbegshi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidi-atbegshi.tlpobj new/tlpkg/tlpobj/bidi-atbegshi.tlpobj --- old/tlpkg/tlpobj/bidi-atbegshi.tlpobj 2016-04-14 18:47:27.000000000 +0200 +++ new/tlpkg/tlpobj/bidi-atbegshi.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/xelatex/bidi-atbegshi/bidi-atbegshi.sty catalogue-ctan /macros/xetex/latex/bidi-atbegshi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bidi xetex catalogue-version 0.1 ++++++ bidi.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/README new/doc/xelatex/bidi/README --- old/doc/xelatex/bidi/README 2016-05-10 23:32:55.000000000 +0200 +++ new/doc/xelatex/bidi/README 2017-06-10 00:33:56.000000000 +0200 @@ -1,6 +1,6 @@ ___________________ The bidi package -v19.5 +v30.7 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -12,18 +12,19 @@ or ask for any new features, or suggest any improvements, or ask any questions about the package, then please do not send any direct email to me; I will not answer any direct email. Instead please use the issue tracker: - <https://github.com/persian-tex/bidi/issues> + <https://github.com/tex-xet/bidi/issues> In doing so, please always explain your issue well enough, always include a minimal working example showing the issue, and always choose the appropriate label for your query (i.e. if you are reporting any bugs, choose `Bug' label). -Current version release date: 2016/05/10 +Current version release date: 2017/06/09 ___________________ Vafa Khalighi persian-tex(a)tug.org +https://www.instagram.com/vafa.khalighi -Copyright (c) 2007--2016 +Copyright (c) 2007--2017 It may be distributed and/or modified under the LaTeX Project Public License, version 1.3c or higher (your choice). The latest version of this license is at: http://www.latex-project.org/lppl.txt Binary files old/doc/xelatex/bidi/bidi.pdf and new/doc/xelatex/bidi/bidi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidi.doc.tlpobj new/tlpkg/tlpobj/bidi.doc.tlpobj --- old/tlpkg/tlpobj/bidi.doc.tlpobj 2016-05-10 23:42:50.000000000 +0200 +++ new/tlpkg/tlpobj/bidi.doc.tlpobj 2017-06-10 02:21:28.000000000 +0200 @@ -1,9 +1,9 @@ name bidi.doc category Package -revision 41016 +revision 44546 shortdesc doc files of bidi relocated 1 -docfiles size=1001 +docfiles size=1030 RELOC/doc/xelatex/bidi/README RELOC/doc/xelatex/bidi/bidi-logo.pdf RELOC/doc/xelatex/bidi/bidi-logo.tex @@ -12,7 +12,6 @@ RELOC/doc/xelatex/bidi/bidismall2e.tex RELOC/doc/xelatex/bidi/gull.jpg RELOC/doc/xelatex/bidi/picture.jpg - RELOC/doc/xelatex/bidi/presentation-sample.tex RELOC/doc/xelatex/bidi/test-arydshln.tex RELOC/doc/xelatex/bidi/test-bidi.tex RELOC/doc/xelatex/bidi/test-brochure.tex ++++++ bidi.tar.xz ++++++ ++++ 6468 lines of diff (skipped) ++++++ bidicontour.doc.tar.xz ++++++ ++++++ bidicontour.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidicontour.tlpobj new/tlpkg/tlpobj/bidicontour.tlpobj --- old/tlpkg/tlpobj/bidicontour.tlpobj 2016-04-14 18:47:27.000000000 +0200 +++ new/tlpkg/tlpobj/bidicontour.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/xelatex/bidicontour/bidicontour.sty catalogue-ctan /macros/xetex/latex/bidicontour -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics decoration colour catalogue-version 0.2 ++++++ bidihl.doc.tar.xz ++++++ ++++++ bidihl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidihl.tlpobj new/tlpkg/tlpobj/bidihl.tlpobj --- old/tlpkg/tlpobj/bidihl.tlpobj 2016-04-14 18:47:27.000000000 +0200 +++ new/tlpkg/tlpobj/bidihl.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/xelatex/bidihl/bidihl.sty catalogue-also bidi catalogue-ctan /macros/xetex/latex/bidihl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics xetex bidi catalogue-version 0.1c ++++++ bidipagegrid.doc.tar.xz ++++++ ++++++ bidipagegrid.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidipagegrid.tlpobj new/tlpkg/tlpobj/bidipagegrid.tlpobj --- old/tlpkg/tlpobj/bidipagegrid.tlpobj 2016-04-14 18:47:28.000000000 +0200 +++ new/tlpkg/tlpobj/bidipagegrid.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=4 RELOC/tex/xelatex/bidipagegrid/bidipagegrid.sty catalogue-ctan /macros/xetex/latex/bidipagegrid -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout-show background xetex bidi catalogue-version 0.2 ++++++ bidipresentation.doc.tar.xz ++++++ ++++++ bidipresentation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidipresentation.tlpobj new/tlpkg/tlpobj/bidipresentation.tlpobj --- old/tlpkg/tlpobj/bidipresentation.tlpobj 2016-04-14 18:47:28.000000000 +0200 +++ new/tlpkg/tlpobj/bidipresentation.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/xelatex/bidipresentation/bidiprescolors.cfg RELOC/tex/xelatex/bidipresentation/bidipresentation.cls catalogue-ctan /macros/xetex/latex/bidipresentation -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics class presentation bidi catalogue-version 0.3 ++++++ bidishadowtext.doc.tar.xz ++++++ ++++++ bidishadowtext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidishadowtext.tlpobj new/tlpkg/tlpobj/bidishadowtext.tlpobj --- old/tlpkg/tlpobj/bidishadowtext.tlpobj 2016-04-14 18:47:28.000000000 +0200 +++ new/tlpkg/tlpobj/bidishadowtext.tlpobj 2017-04-14 17:33:55.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/xelatex/bidishadowtext/bidishadowtext.sty catalogue-ctan /macros/xetex/latex/bidishadowtext -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics decoration xetex bidi catalogue-version 0.1 ++++++ bigfoot.doc.tar.xz ++++++ ++++++ bigfoot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bigfoot.tlpobj new/tlpkg/tlpobj/bigfoot.tlpobj --- old/tlpkg/tlpobj/bigfoot.tlpobj 2016-04-14 18:47:29.000000000 +0200 +++ new/tlpkg/tlpobj/bigfoot.tlpobj 2017-04-14 17:33:56.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/bigfoot/perpage.sty RELOC/tex/latex/bigfoot/suffix.sty catalogue-ctan /macros/latex/contrib/bigfoot -catalogue-date 2015-08-30 19:17:38 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics footnote catalogue-version 2.1 ++++++ bigints.doc.tar.xz ++++++ ++++++ bigints.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bigints.tlpobj new/tlpkg/tlpobj/bigints.tlpobj --- old/tlpkg/tlpobj/bigints.tlpobj 2016-04-14 18:47:29.000000000 +0200 +++ new/tlpkg/tlpobj/bigints.tlpobj 2017-04-14 17:33:56.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=2 RELOC/tex/latex/bigints/bigints.sty catalogue-ctan /macros/latex/contrib/bigints -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths

1 0

commit texlive-specs-b for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-b for openSUSE:Factory checked in at 2017-06-25 19:21:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-b (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-b.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-b" Sun Jun 25 19:21:15 2017 rev:26 rq:504789 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-b/texlive-specs-b.changes 2017-06-08 14:53:55.303924402 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-b.new/texlive-specs-b.changes 2017-06-25 19:22:19.914587124 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)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(a)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(a)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(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- babel-bahasa.doc.tar.xz babel-bahasa.tar.xz basque-date.doc.tar.xz basque-date.tar.xz bbcard.doc.tar.xz bbcard.tar.xz bbding.doc.tar.xz bbding.tar.xz bbm-macros.doc.tar.xz bbm-macros.tar.xz bbm.doc.tar.xz bbm.tar.xz bbold-type1.doc.tar.xz bbold-type1.tar.xz bbold.doc.tar.xz bbold.tar.xz bbold_bbold11.dif bchart.doc.tar.xz bchart.tar.xz bclogo.doc.tar.xz bclogo.tar.xz beamer-FUBerlin.doc.tar.xz beamer.doc.tar.xz beamer.tar.xz New: ---- around-the-bend.doc.tar.xz arphic-ttf.doc.tar.xz arphic-ttf.tar.xz arphic.doc.tar.xz arphic.tar.xz aucklandthesis.doc.tar.xz aucklandthesis.tar.xz aurl.doc.tar.xz aurl.tar.xz autoaligne.doc.tar.xz autoaligne.tar.xz autobreak.doc.tar.xz autobreak.tar.xz awesomebox.doc.tar.xz awesomebox.tar.xz axodraw2.doc.tar.xz axodraw2.tar.xz babel-azerbaijani.doc.tar.xz babel-azerbaijani.tar.xz babel-indonesian.doc.tar.xz babel-indonesian.tar.xz babel-japanese.doc.tar.xz babel-japanese.tar.xz babel-malay.doc.tar.xz babel-malay.tar.xz baekmuk.doc.tar.xz baekmuk.tar.xz bangorexam.doc.tar.xz bangorexam.tar.xz baskervillef.doc.tar.xz baskervillef.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-b.spec ++++++ ++++ 11043 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-b/texlive-specs-b.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-b.new/texlive-specs-b.spec ++++++ arrayjobx.doc.tar.xz ++++++ ++++++ arrayjobx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arrayjobx.tlpobj new/tlpkg/tlpobj/arrayjobx.tlpobj --- old/tlpkg/tlpobj/arrayjobx.tlpobj 2016-04-14 18:35:51.000000000 +0200 +++ new/tlpkg/tlpobj/arrayjobx.tlpobj 2017-04-14 17:28:36.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/generic/arrayjobx/arrayjob.sty RELOC/tex/generic/arrayjobx/arrayjobx.sty catalogue-ctan /macros/generic/arrayjobx -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.04 ++++++ arraysort.doc.tar.xz ++++++ ++++++ arraysort.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arraysort.tlpobj new/tlpkg/tlpobj/arraysort.tlpobj --- old/tlpkg/tlpobj/arraysort.tlpobj 2016-04-14 18:35:52.000000000 +0200 +++ new/tlpkg/tlpobj/arraysort.tlpobj 2017-04-14 17:28:36.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/arraysort/arraysort.sty catalogue-ctan /macros/latex/contrib/arraysort -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics macro-supp catalogue-version 1.0 ++++++ arsclassica.doc.tar.xz ++++++ Binary files old/doc/latex/arsclassica/ArsClassica.pdf and new/doc/latex/arsclassica/ArsClassica.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/ArsClassica.tex new/doc/latex/arsclassica/ArsClassica.tex --- old/doc/latex/arsclassica/ArsClassica.tex 2012-02-12 01:12:22.000000000 +0100 +++ new/doc/latex/arsclassica/ArsClassica.tex 2017-03-15 23:01:04.000000000 +0100 @@ -1,24 +1,25 @@ -\documentclass[10pt,a4paper,twoside,openright,titlepage,fleqn,% - headinclude,,footinclude,BCOR5mm,% - numbers=noenddot,cleardoublepage=empty,% +% !TEX TS-program = pdflatex +% !TEX root = ArsClassica.tex + +\documentclass[a4paper,twoside,openright,titlepage, + headinclude,,footinclude,BCOR5mm, + numbers=noenddot,cleardoublepage=empty, tablecaptionabove]{scrreprt} -\usepackage[italian,american]{babel} -\usepackage[applemac]{inputenc} \usepackage[T1]{fontenc} -\usepackage{amsmath,amssymb,amsthm} -\usepackage{varioref} -\usepackage[style=philosophy-modern,hyperref,square,natbib]{biblatex} +\usepackage[utf8]{inputenc} +\usepackage[english]{babel} +\usepackage{amsmath,amssymb} +\usepackage{indentfirst} +\usepackage[style=philosophy-modern,hyperref]{biblatex} \usepackage{chngpage} \usepackage{calc} \usepackage{listings} \usepackage{graphicx} \usepackage{subfig} -\usepackage{multicol} -\usepackage{makeidx} -\usepackage{fixltx2e} -\usepackage{relsize} \usepackage{lipsum} +\usepackage{shapepar} +\usepackage{pifont} \usepackage[eulerchapternumbers,subfig,beramono,eulermath,pdfspacing,listings]{classicthesis} \usepackage{arsclassica} @@ -27,29 +28,16 @@ \begin{document} \pagenumbering{roman} \pagestyle{plain} -%****************************************************************** -% Frontmatter -%****************************************************************** \input{FrontBackMatter/Titlepage} \input{FrontBackMatter/Titleback} -\clearpage -\input{FrontBackMatter/Abstract+Sommario} +\cleardoublepage \input{FrontBackMatter/Acknowledgements} \pagestyle{scrheadings} -\clearpage \input{FrontBackMatter/Contents} \cleardoublepage -%****************************************************************** -% Mainmatter -%****************************************************************** \pagenumbering{arabic} \input{Chapters/Fundamentals} \input{Chapters/Code} -% ***************************************************************** -% Backmatter -%****************************************************************** \clearpage \input{FrontBackMatter/Bibliography} -\clearpage -\input{FrontBackMatter/Index} \end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/Bibliography.bib new/doc/latex/arsclassica/Bibliography.bib --- old/doc/latex/arsclassica/Bibliography.bib 2012-02-12 01:12:22.000000000 +0100 +++ new/doc/latex/arsclassica/Bibliography.bib 2017-03-15 23:01:04.000000000 +0100 @@ -8,26 +8,32 @@ @manual{miede:classicthesis, - author = {Miede, Andr}, + author = {Miede, Andr\'e}, title = {A Classic Thesis style}, - year = {2011}, + year = {2016}, url = {http://www.ctan.org/tex-archive/macros/latex/contrib/classicthesis/ClassicThesis.pdf} } -@manual{pantieri:classicthesis, - author = {Pantieri, Lorenzo}, - title = {Introduzione allo stile \classicthesis}, - year = {2011}, - url = {http://www.lorenzopantieri.net/LaTeX_files/ClassicThesis.pdf}, - note = {in Italian} +@manual{pantieri:arte, + author = {Pantieri, Lorenzo and Gordini, Tommaso}, + title = {L'arte di scrivere con \LaTeX}, + year = {2017}, + url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf}, } -@manual{pantieri:art, +@manual{pantieri:latexpedia, author = {Pantieri, Lorenzo and Gordini, Tommaso}, - title = {L'arte di scrivere con \LaTeX}, - year = {2012}, - url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf}, - note = {in Italian} + title = {\LaTeX\-pedia}, + year = {2017}, + url = {http://www.lorenzopantieri.net/LaTeX_files/LaTeXpedia.pdf}, } + + +@manual{pantieri:impaziente, + author = {Pantieri, Lorenzo and Gordini, Tommaso}, + title = {\LaTeX{} per l'impaziente}, + year = {2017}, + url = {http://www.lorenzopantieri.net/LaTeX_files/LaTeXimpaziente.pdf}, +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/CHANGES new/doc/latex/arsclassica/CHANGES --- old/doc/latex/arsclassica/CHANGES 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -Changes in version 4.0.3 (February 2012) -o Fixed page numbers with "oneside" global option - -Changes in version 4.0.2 (February 2012) -o Fixed some details in the documentation - -Changes in version 4.0.1 (February 2012) -o Bug fix: caption package loaded via arsclassica -o Fixed some details in the documentation - -Changes in version 4.0 (February 2012) -o Added compatibility with the version 4.0 of ClassicThesis and its new text body size - -Changes in version 3.0 (June 2010) -o Added compatibility with the version 3.0 of ClassicThesis -o Removed language option: the package now has no option at all -o Fixed the chapter titles spreading in more than one line -o \ctTeX command fixed -o biblatex package used to make the bibliography in the documentation -o Documentation only in English - -Changes in version 2.7 (February 2010) -o Added compatibility with the "backref" option of classicthesis-ldpkg, introduced with the 2.7 version of ClassicThesis - -Changes in version 2.5.4 (January 2009) -o Corrected some typos in the documentation - -Changes in version 2.5.3 (January 2009) -o Documentation both in English and in Italian -o Support for the English, French, Spanish and German language, via the new options "english" (default), "french", "spanish" and "german", respectively - -Changes in version 2.5.2 (December 2008) -o The numbers of parts are now in Roman (uppercase), rather than in roman (lowercase) - -Changes in version 2.5.1 (November 2008) -o Fixed some details in the documentation -o Note: Thanks to all the folks who already sent me some advices! - -Version 2.5 (November 2008) -o First public release \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/Changes new/doc/latex/arsclassica/Changes --- old/doc/latex/arsclassica/Changes 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/arsclassica/Changes 2017-03-15 23:01:04.000000000 +0100 @@ -0,0 +1,36 @@ +March 2017 +o Fixed some details in the documentation + +January 2017 +o The subsection, subsubsection and paragraph titles are now in boldface +o Larger text body size +o Removed commands \arsincludegraphics, \ctLaTeX, \ctLaTeXe, \ctTeX: now the package has no commands at all +o Fixed some details in the documentation and in arsclassica-settings file +o Rationalized "Changes" file + +February 2012 +o Fixed page numbers with "oneside" global option +o Caption package loaded +o Added compatibility with ClassicThesis 4.0 +o Fixed some details in the documentation + +June 2010 +o Added compatibility with ClassicThesis 3.0 +o Removed language option: the package now has no option at all +o In the documentation, bibliography made with biblatex package +o Documentation only in English + +February 2010 +o Added compatibility with ClassicThesis 2.7 + +January 2009 +o Corrected some typos in the documentation +o Documentation both in English and in Italian +o Support for English, French, Spanish and German + +December 2008 +o The part numbers are now in Roman (uppercase) and not in roman (lowercase) +o Fixed some details in the documentation + +November 2008 +o First public release \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/Chapters/Code.tex new/doc/latex/arsclassica/Chapters/Code.tex --- old/doc/latex/arsclassica/Chapters/Code.tex 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/Chapters/Code.tex 2017-03-15 23:01:04.000000000 +0100 @@ -1,30 +1,43 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %************************************************ -\chapter{The code} +\chapter{Code} \label{chp:code} %************************************************ - \lstset{numbers=left, numberstyle=\scriptsize, stepnumber=1, numbersep=8pt } -Announcement of the package and requirement for the necessary packages. + + +Package announcement and request for necessary packages. \begin{lstlisting}[firstnumber=1] \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{arsclassica}[2012/02/21 v4.0 Customizing ClassicThesis (LP)] +\ProvidesPackage{arsclassica}[2017/02/01] \RequirePackage{classicthesis} \RequirePackage{caption} \end{lstlisting} -Use of Iwona\index{Iwona} as font sans serif. + +Text body size. +\begin{lstlisting} +\areaset[current]{370pt}{784pt} +\end{lstlisting} + + + +Use of Iwona as font sans serif. \begin{lstlisting} \renewcommand{\sfdefault}{iwona} \end{lstlisting} + Customized chapter numbers. \begin{lstlisting} \let\chapterNumber\undefined @@ -35,7 +48,7 @@ -Small caps sans serif. +Smallcaps sans serif. \begin{lstlisting} \ifthenelse{\boolean{@minionprospacing}}% {% @@ -72,8 +85,7 @@ \begin{lstlisting} \renewcommand{\sectionmark}[1]{\markright{\textsc% {\MakeTextLowercase{\thesection}} \spacedlowsmallcaps{#1}}} -\lehead{\mbox{\llap{\small\thepage\kern1em\color{halfgray}% -\vline}% +\lehead{\mbox{\llap{\small\thepage\kern1em\color{halfgray}\vline}% \color{halfgray}\hspace{0.5em}\headmark\hfil}} \rohead{\mbox{\hfil{\color{halfgray}% \headmark\hspace{0.5em}}% @@ -84,12 +96,12 @@ -Use of Iwona\index{Iwona} for the titles of sectioning units (chapters, sections, subsections, sub-subsections, paragraphs, subparagraphs) and for the labels of description lists. +Sectioning unit titles and description list labels in Iwona. \begin{lstlisting} \RequirePackage{titlesec} - % parts - \ifthenelse{\boolean{@parts}}% - {% + % parts + \ifthenelse{\boolean{@parts}}% + {% \titleformat{\part}[display] {\normalfont\centering\large}% {\thispagestyle{empty}\partname~\thepart}{1em}% @@ -99,47 +111,45 @@ \ifthenelse{\boolean{@linedheaders}}% {% \titleformat{\chapter}[display]% - {\relax}{\raggedleft{\color{halfgray}% - \chapterNumber\thechapter} \\ }{0pt}% - {\titlerule\vspace*{.9\baselineskip}\raggedright% - \spacedallcaps}% - [\normalsize\vspace*{.8\baselineskip}\titlerule]% + {\relax}{\raggedleft{\color{halfgray}% + \chapterNumber\thechapter} \\ }{0pt}% + {\titlerule\vspace*{.9\baselineskip}\raggedright% + \spacedallcaps}% + [\normalsize\vspace*{.8\baselineskip}\titlerule]% }{% \titleformat{\chapter}[block]% - {\normalfont\Large\sffamily}% - {{\color{halfgray}\chapterNumber\thechapter% - \hspace{10pt}\vline} }{10pt}% - {\spacedallcaps}} + {\normalfont\Large\sffamily}% + {{\color{halfgray}\chapterNumber\thechapter% + \hspace{10pt}\vline} }{10pt}% + {\spacedallcaps}} % sections \titleformat{\section} - {\normalfont\Large\sffamily}{\textsc% - {\MakeTextLowercase{\thesection}}}% - {1em}{\spacedlowsmallcaps} + {\normalfont\Large\sffamily}{\textsc% + {\MakeTextLowercase{\thesection}}}% + {1em}{\spacedlowsmallcaps} % subsections - \titleformat{\subsection} - {\normalfont\sffamily}{\textsc{\MakeTextLowercase% - {\thesubsection}}}{1em}{\normalsize} + \titleformat{\subsection} + {\normalfont\sffamily\bfseries}{\textsc{\MakeTextLowercase% + {\thesubsection}}}{1em}{\normalsize} % subsubsections \titleformat{\subsubsection} - {\normalfont\sffamily\itshape}{\textsc% - {\MakeTextLowercase{\thesubsubsection}}}% - {1em}{\normalsize\itshape} + {\normalfont\sffamily\bfseries\itshape}{\textsc% + {\MakeTextLowercase{\thesubsubsection}}}% + {1em}{\normalsize\itshape} % paragraphs \titleformat{\paragraph}[runin] - {\normalfont\normalsize\sffamily}{\textsc% - {\MakeTextLowercase{\theparagraph}}}% - {0pt}{\spacedlowsmallcaps} - % descriptionlabels + {\normalfont\normalsize\sffamily\bfseries}{\textsc% + {\MakeTextLowercase{\theparagraph}}}% + {0pt}{\spacedlowsmallcaps} + % description labels \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}% \bfseries\spacedlowsmallcaps{#1}} - \titlespacing*{\chapter}{0pt}{1\baselineskip}% - {2\baselineskip} + \titlespacing*{\chapter}{0pt}{1\baselineskip}{2\baselineskip} \titlespacing*{\section}{0pt}{2\baselineskip}% - {.8\baselineskip}[\marginparsep] + {.8\baselineskip}[\marginparsep] \titlespacing*{\subsection}{0pt}{1.5\baselineskip}% - {.8\baselineskip}[\marginparsep] - \titlespacing*{\paragraph}{0pt}{1\baselineskip}% - {1\baselineskip} + {.8\baselineskip}[\marginparsep] + \titlespacing*{\paragraph}{0pt}{1\baselineskip}{1\baselineskip} \newcommand\formatchapter[1]{% \vbox to \ht\strutbox{ @@ -152,8 +162,8 @@ \hspace{10pt}\vline\ }{10pt} {\formatchapter} - \if@twoside% - \rofoot[\mbox{\makebox[0pt][l]{\kern1em\thepage}}]{}\fi + \clearscrplain + \rofoot[\mbox{\makebox[0pt][l]{\kern1em\thepage}}]{} \end{lstlisting} @@ -165,7 +175,7 @@ -Settings of captions. +Caption settings. \begin{lstlisting} \captionsetup{format=hang,font=small,labelfont={sf,bf}} \captionsetup[table]{skip=\medskipamount} @@ -173,119 +183,19 @@ - - -Settings of \pkgname{hyperref}. +Hyper-reference settings. \begin{lstlisting} -\hypersetup{% +\hypersetup{ colorlinks=true, linktocpage=true, pdfstartpage=1, pdfstartview=FitV, breaklinks=true, pdfpagemode=UseNone, - pageanchor=true, pdfpagemode=UseOutlines,% + pageanchor=true, pdfpagemode=UseOutlines, plainpages=false, bookmarksnumbered, - bookmarksopen=true,% - bookmarksopenlevel=1,% - hypertexnames=true, pdfhighlight=/O,% + bookmarksopen=true, bookmarksopenlevel=1, + hypertexnames=true, pdfhighlight=/O, urlcolor=webbrown, linkcolor=RoyalBlue, - citecolor=webgreen,% - hyperfootnotes=false,pdfpagelabels, - pdfsubject={},% - pdfkeywords={},% - pdfcreator={pdfLaTeX},% - pdfproducer={LaTeX with hyperref and ClassicThesis}% + citecolor=webgreen, + hyperfootnotes=false, pdfpagelabels, + pdfcreator={pdfLaTeX}, + pdfproducer={LaTeX with ArsClassica} } -\end{lstlisting} - - - -Some fine adjustment when the \pkgname{minitoc} package is used. -\begin{lstlisting} -\@ifpackageloaded{minitoc} -{% - \MakeLowercase{\gdef\noexpand\ptctitle{\ptctitle}} - \MakeLowercase{\gdef\noexpand\mtctitle{\mtctitle}} - \MakeLowercase{\gdef\noexpand\stctitle{\stctitle}} - \setlength{\mtcindent}{0pt} - \renewcommand{\mtifont}{\normalsize\sffamily - \scshape\lsstyle} -} -{} -\end{lstlisting} - - -Definition of the -{\ttfamily\textbackslash\color{RoyalBlue}{ctLaTeX}}, -{\ttfamily\textbackslash\color{RoyalBlue}{ctLaTeXe}} and -{\ttfamily\textbackslash\color{RoyalBlue}{ctTeX}} commands, -which allow to reproduce respectively the \LaTeX, \LaTeXe{} e \TeX{} logos correctly written in Iwona.\index{Iwona} -\begin{lstlisting} -\def\@ppljLaTeX{{\upshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont A}% - \sbox\tw@ T% - L\kern-.55\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.25\wd0 - \@ctTeX}} -\def\@ppljTeX{{\upshape T\kern -.08em \lower .3ex\hbox{E}% -\kern -.08em X}} - -\def\@ppljscLaTeX{{\upshape\scshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont a}% - \sbox\tw@ t% - l\kern-.6\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.25\wd0 - \@ctTeX}} -\def\@ppljscTeX{{\upshape\scshape t\kern -.085em -\lower .25ex\hbox{e}\kern -.085em x}} - -\def\@iwonaLaTeX{{\upshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont A}% - \sbox\tw@ T% - L\kern-.5\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.2\wd0 - \@ctTeX}} -\def\@iwonaTeX{{\upshape T\kern -.12em \lower .3ex\hbox{E}% - \kern -.12em X}} - -\def\@iwonascLaTeX{{\upshape\scshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse% - \selectfont a}% - \sbox\tw@ t% - l\kern-.5\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.2\wd0 - \@ctTeX}} -\def\@iwonascTeX{{\upshape\scshape t\kern -.1em - \lower .25ex\hbox{e}\kern -.1em x}} - -\def\ct@sc{sc} -\def\@ctTeX{\csname @\f@family\ifx\f@shape\ct@sc sc% -\fi TeX\endcsname} - -\DeclareRobustCommand\ctLaTeX{% - \texorpdfstring{\textls[1]{\csname @\f@family\ifx% - \f@shape\ct@sc sc\fi LaTeX\endcsname}}{LaTeX}} -\DeclareRobustCommand\ctLaTeXe{% - \texorpdfstring{\textls[1]{\ctLaTeX\csname @\ifx% - \f@shape\ct@sc sc\fi twoe\endcsname}}{LaTeX2e}} - -\def\@twoe{\kern.1em$\m@th2_{\textstyle\varepsilon}$} -\def\@sctwoe{\kern.15em$\m@th{\scriptscriptstyle2}% -_\varepsilon$} - -\DeclareRobustCommand\ctTeX{% - \texorpdfstring{\textls[1]{\@ctTeX}}{TeX}} - -\def\toc@headingbkORrp{% - \def\toc@heading{% - \chapter*{\contentsname}% - \@mkboth{\spacedlowsmallcaps{\contentsname}} - {\spacedlowsmallcaps{\contentsname}}}} -\@ifclassloaded{scrreprt}{\toc@headingbkORrp}{} -\@ifclassloaded{scrbook}{\toc@headingbkORrp}{} -\end{lstlisting} +\end{lstlisting} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/Chapters/Fundamentals.tex new/doc/latex/arsclassica/Chapters/Fundamentals.tex --- old/doc/latex/arsclassica/Chapters/Fundamentals.tex 2012-02-12 01:12:22.000000000 +0100 +++ new/doc/latex/arsclassica/Chapters/Fundamentals.tex 2017-03-15 23:01:04.000000000 +0100 @@ -1,3 +1,6 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %************************************************ \chapter{Fundamentals} \label{chp:fundamentals} @@ -6,16 +9,15 @@ This chapter introduces the (truly simple) basic notions of \arsclassica{} and presents its fundamental ideas and distinctive features. -\section{Introduction} - -The \arsclassica{} package changes some typographical features of the \classicthesis{} style, designed by Andr\'e Miede~\citep{miede:classicthesis,pantieri:classicthesis}. It allows to reproduce the layout of the \LaTeX{} guide \emph{The Art of Writing with \LaTeX}~\citep{pantieri:art} (in Italian) and of this document. The hint for this original reworking of \classicthesis{} was given to me by Daniel Gottschlag. +\section{Introduction} +The \arsclassica{} package changes some features of the \classicthesis{} style, designed by Andr\'e Miede. It allows to reproduce the layout of the \LaTeX{} guide \emph{The Art of Writing with \LaTeX}~\parencite{pantieri:arte} and of this document. -\section{Use of the package} +\section{Use} -This package is shaped to be executed on a \emph{complete} installation of \miktex{} or \texlive, and uses freely available fonts. -It works with the \clsname{KOMA-Script} classes (\clsname{scrreprt}, \clsname{scrbook} and \clsname{scrartcl}) and requires the \pkgname{classicthesis} package, \emph{updated to the last version available (the~4.0)}. \arsclassica{} must be loaded \emph{after} \pkgname{classicthesis}: +This package is shaped to be executed on a \emph{complete} installation of \TeX{}~Live or MiK\TeX, and uses freely available fonts. +It works with the \clsname{KOMA-Script} classes (\clsname{scrreprt}, \clsname{scrbook} and \clsname{scrartcl}) and requires the \pkgname{classicthesis} package. \arsclassica{} must be loaded \emph{after} \pkgname{classicthesis}: \begin{code} \documentclass[£*\meta{\dots\unkern}*£]{scrreprt} % or scrbook or scrartcl @@ -29,15 +31,15 @@ For example, this document has been produced with the following code: \begin{code} -\documentclass[10pt,a4paper,twoside,openright,titlepage,fleqn,% - headinclude,footinclude,BCOR5mm,% - numbers=noenddot,cleardoublepage=empty,% +\documentclass[a4paper,twoside,openright,titlepage, + headinclude,footinclude,BCOR5mm, + numbers=noenddot,cleardoublepage=empty, tablecaptionabove]{scrreprt} \usepackage{£*\meta{\dots\unkern}*£} \usepackage{subfig} -\usepackage[eulerchapternumbers,subfig,beramono,% - eulermath,pdfspacing]{classicthesis} +\usepackage[eulerchapternumbers,subfig,beramono,eulermath,pdfspacing]% + {classicthesis} \usepackage{arsclassica} \begin{document} @@ -45,73 +47,82 @@ \end{document} \end{code} -It is recommended, but not compulsory, to use the options \optname{beramono}, \optname{eulerchapternumbers} and \optname{eulermath} together with \arsclassica. - +It is recommended to use the \optname{beramono} and \optname{eulerchapternumbers} options together with \arsclassica. +\section{Style} - -\section{The style} - -The typographical style achieved with \arsclassica{} differs from ClassicThesis in the following points: +The typographical style achieved with \arsclassica{} differs from \classicthesis{} in the following points: \begin{itemize} -\item use of Iwona\index{Iwona} font, by Janusz M.~Nowacki, for the titles of the sectioning units of the document (chapters, sections, subsections, sub-subsections, paragraphs and subparagraphs), for the labels of description lists, for the headlines and the label of the captions (\classicthesis{} does not use any sans serif font); +\item use of Iwona font, by Janusz Nowacki, for the sectioning unit titles (chapters, sections, subsections, sub-subsections, paragraphs and subparagraphs), for the description list labels, the headlines and the caption labels (\classicthesis{} doesn't use any sans serif font); \item customized chapter numbers; \item semi-transparent headlines; the headlines are separated from the page number by a small rule; -\item captions with labels in boldface (\classicthesis{} does not use any boldface font); +\item caption labels in boldface (\classicthesis{} doesn't use any boldface font); \item itemize lists with semi-transparent bullets. \end{itemize} -The \arsclassica{} package is designed to provide a ready-to-use typographical style: therefore it has no loading option and it is \emph{not} configurable or customizable in any way. If you change the previous settings, you will risk to destroy the balance of the style, so it is \emph{highly recommended} to keep them unchanged. - -One of the principles of \LaTeX{} is that it allows the author to take no interest in the typographical questions, permitting him to focus only the structure and the contents of the document. This fact should always be taken in consideration: using a style written by others, the user accepts all the typographical settings chosen for him by the author of the style, and he is not forced to study typography to fix the layout of his publications. This is the case of \arsclassica{} too: if you change its settings, you will deny this philosophy and, consequently, you must study (a lot of) typography to achieve acceptable results. - -The style achieved with \arsclassica{} is \emph{not} therefore configurable or customizable. The typographical style is something of very personal: if you like the package and find attractive the idea to take no interest in the problem of the style definition, then you will use \arsclassica{} with satisfaction; otherwise, if you have different needs or you are not satisfied with the layout of the package, then you should try other classes or packages, even building your own style. - +\arsclassica{} is designed to provide a ready-to-use typographical style: for this reason it has no loading options and it is \emph{not} configurable or customizable in any way. If you change the previous settings, you'll risk to destroy the balance of the style, so it is \emph{highly recommended} to keep them unchanged. +One of the principles of \LaTeX{} is that it allows the author to take no interest in the typographical questions, permitting him to focus only on the structure and the contents of his document. This fact should always be kept in mind: using a style written by others, the user accepts all the typographical settings chosen for him by the author of the style, and he isn't forced to study typography to fine-tune the layout of his publications. This is the case of \arsclassica{} too: if you change its settings, you'll deny this philosophy and, consequently, you'll have to study (a lot of) typography to achieve acceptable results. -\section{New commands} - -The package offers the \cmdname{ctLaTeX}, \cmdname{ctLaTeXe} and \cmdname{ctTeX} commands, which allow to reproduce respectively the \LaTeX, \LaTeXe{} and \TeX{} logos correctly written in Iwona.\index{Iwona} +The style achieved with \arsclassica{} is \emph{not} therefore configurable or customizable. The typographical style is very personal: if you like this package and find attractive the idea to take no interest in the problem of the style definition, then you'll use \arsclassica{} with satisfaction; otherwise, if you have different needs or you aren't satisfied with the layout of the package, then you should try other classes or packages, even building your own style. +\section{Important} +To write a document according to the \arsclassica{} style, you have to follow some very simple rules. +\begin{itemize} +\item Don't change \emph{for any reason} the \arsclassica{} settings (fonts, text body size, colors, \dots). +\item The sectioning unit titles (chapters, section, subsections, \dots) have to be \emph{one line long}, possibly in \emph{plain text} (no symbols, formulas or code fragments). If you have titles longer than one line, try and rephrase them: you can almost always do it. +\item In the table of contents and in the list of tables and figures, captions have to be \emph{one line long}, possibly in \emph{plain text}. Use the optional argument of sectioning commands and of \cmdname{caption}, if necessary. +\item Don't use \optname{tocaligned} and \optname{dottedtoc} options of \classicthesis: the default table of contents does the job very well (see the documentation of \classicthesis{} for a nice discussion of this point). +\item Don't use vertical or double rules in your tables (see the documentation of \pkgname{booktabs}). +\item Use footnotes and margin notes very sparingly. +\item If your document includes graphs and plots, draw them using \LaTeX{} (by \pkgname{Ti\emph{k}Z} and \pkgname{pgfplots}, for example) and not an external software. This is the only way to get the best typographical outcome. +\end{itemize} + \section{Examples} \begin{figure} \centering -\subfloat[Asia personas duo.] -{\includegraphics[width=.45\columnwidth]{Example_1}} \quad -\subfloat[Pan ma signo.] +\subfloat[Asia personas duo] +{\includegraphics[width=.45\columnwidth]{Lorem}} \quad +\subfloat[Pan ma signo] {\label{fig:example-b}% -\includegraphics[width=.45\columnwidth]{Example_2}} \\ -\subfloat[Methodicamente o uno.] -{\includegraphics[width=.45\columnwidth]{Example_3}} \quad -\subfloat[Titulo debitas.] -{\includegraphics[width=.45\columnwidth]{Example_4}} -\caption[Tu duo titulo debitas latente.]{Tu duo titulo debitas -latente.}\label{fig:example} +\includegraphics[width=.45\columnwidth]{Ipsum}} \\ +\subfloat[Methodicamente o uno] +{\includegraphics[width=.45\columnwidth]{Dolor}} \quad +\subfloat[Titulo debitas] +{\includegraphics[width=.45\columnwidth]{Sit}} +\caption[Tu duo titulo debitas latente]{Tu duo titulo debitas latente} +\label{fig:example} \end{figure} -Note: The content of this chapter is just some dummy text. It is not a real language. +Please note that the content of this section is just some dummy text. It isn't a real language. -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna. Donec vehicula augue eu neque. +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. \subsection*{A subsection} + \lipsum[2] \subsubsection*{A sub-subsection} -\lipsum[3] -\paragraph{A paragraph} Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna. +\lipsum[7] + +\paragraph{A paragraph} +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna. + +\paragraph{Another paragraph} +Cras nec ante, pellentesque a nulla, cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aliquam tincidunt urna \bigskip -\lipsum[2] +Donec aliquet, tortor sed accumsan bibendum, erat ligula aliquet magna, vitae ornare odio metus a mi. Morbi ac orci et nisl hendrerit mollis. Suspendisse ut massa. Cras nec ante. Pellentesque a nulla. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aliquam tincidunt urna. \begin{description} \item[Mane] Lorem ipsum dolor sit amet, consectetuer adipiscing elit. @@ -121,20 +132,92 @@ \end{description} \begin{table} -\caption[Lorem ipsum dolor.]{Lorem ipsum dolor sit amet.} +\caption{Lorem ipsum dolor sit amet} \centering -\begin{tabular}{cc} +\begin{tabular}{ll} \toprule -$p$ & $\lnot p$ \\ +\textbf{Alkaloid} & \textbf{Origin} \\ \midrule -V & F \\ -F & V \\ -\bottomrule +atropine & belladonna \\ +morphine & poppy \\ +nicotine & tobacco \\ +\bottomrule \end{tabular} \end{table} -\lipsum[1] +Suspendisse vel felis. Ut lorem lorem, interdum eu, tincidunt sit amet, laoreet vitae, arcu. Aenean faucibus pede eu ante. Praesent enim elit, rutrum at, molestie non, nonummy vel, nisl. Ut lectus eros, malesuada sit amet, fermentum eu, sodales cursus, magna. Donec eu purus. Quisque vehicula, urna sed ultricies auctor, pede lorem egestas dui, et convallis elit erat sed nulla. +\subsection*{Some formulas} +Una formula in linea viene incorporata nel testo: $\lim_{n \to \infty}\sum_{k=1}^n \frac{1}{k^2} = \frac{\pi^2}{6}$, per esempio. Come si osserva, \LaTeX{} fa \emph{il possibile} per comprimerla e modificare il meno possibile l'interlinea nel capoverso che la contiene. +Una formula in display viene invece composta da \LaTeX{} su linee a parte, separate dal contesto con adeguati spazi bianchi per metterla in mostra e farla risaltare sulla pagina. +\begin{equation} +\lim_{n \to \infty}\sum_{k=1}^n \frac{1}{k^2}= \frac{\pi^2}{6} +\end{equation} +Come si osserva, ora la formula risulta centrata, non compressa, e tutti i suoi elementi occupano il giusto spazio con un risultato finale di grande respiro. + +Integer tempus convallis augue. Etiam facilisis. Nunc elementum fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget enim. + +\begin{equation} +\int_a^{a+T}f(x)\,dx= \int_0^T f(x)\,dx +\qquad +\oint f(z)\,dz=2\pi i +\end{equation} + +Nulla malesuada porttitor diam. Donec felis erat, congue non, volutpat at, tincidunt tristique, libero. Vivamus viverra fermentum felis. Donec non- ummy pellentesque ante. + +\begin{equation} +f(x_1,\dots,x_n)= \prod_{k=1}^n x_k +\qquad +\sum_{k=1}^n x_k^2=1 +\qquad +\biggl(\sum_n x_n^2\biggr)^{1/2} +\end{equation} + +\lipsum[2] +\begin{equation} +\begin{bmatrix} +a_{11} & \dots & a_{1n} \\ +a_{21} & \dots & a_{2n} \\ +\hdotsfor{3} \\ +a_{n1} & \dots & a_{nn} +\end{bmatrix} +\end{equation} + +\lipsum[4] + +\begin{equation} +\lim_{x\to 0} +\frac{\sin x}{x}=1 \qquad +\lim_{n\to +\infty}f_n=\delta +\end{equation} + +Fusce mauris. Vestibulum luctus nibh at lectus. Sed bibendum, nulla a faucibus semper, leo velit ultricies tellus, ac venenatis arcu wisi vel nisl. Vestibulum diam. + +\begin{equation} +n!= +\begin{cases} +1 & \text{if $n=0$} \\ +n(n-1)! & \text{if $n\ge 1$} +\end{cases} +\end{equation} + +Ut lectus eros, malesuada sit amet, fermentum eu, sodales cursus, magna. Donec eu purus. Quisque vehicula, urna sed ultricies auctor, pede lorem egestas dui, et convallis elit erat sed nulla. Donec luctus. Curabitur et nunc. Aliquam dolor odio, commodo pretium, ultricies non, pharetra in, velit. + +\begin{equation} +x_G= +\frac{\displaystyle + \sum_{i=1}^n m_ix_i} +{\displaystyle\sum_{i=1}^n m_i} +\end{equation} + +\lipsum[6] + +\begin{equation} +\kappa =\frac{\xi}{E_{\textrm{max}}} +\qquad +E_{\textup{max}} =\frac{2 m_{\textup{e}} \beta^2\gamma^2 }{1 +2\gamma m_{\textup{e}}/m_{\textrm{x}} + ( m_{\textup{e}}/m_{\textup{x}})^2} +\end{equation} +\lipsum[8] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex new/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex --- old/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -%******************************************************* -% Abstract+Sommario -%******************************************************* - -\pdfbookmark{Abstract}{Abstract} -\begingroup -\let\clearpage\relax -\let\cleardoublepage\relax -\let\cleardoublepage\relax - -\chapter*{Abstract} -This package changes some typographical features of the \classicthesis{} style, by Andr Miede. It allows to reproduce the layout of the guide \emph{The Art of Writing with \LaTeX} (in Italian)~\citep{pantieri:art}. The hint for this original reworking of \classicthesis{} was given to me by Daniel Gottschlag. This package was written for the Italian \TeX{} and \LaTeX{} User Group (\url{http://www.guitex.org/}). - -\vfill - -\selectlanguage{italian} -\pdfbookmark[1]{Sommario}{Sommario} -\chapter*{Sommario} -Il pacchetto modifica alcuni aspetti tipografici dello stile \classicthesis, di Andr Miede. Permette di riprodurre la veste grafica della guida \emph{L'arte di scrivere con \LaTeX}~\citep{pantieri:art}. Lo spunto per l'originale rielaborazione di \classicthesis{} mi stato offerto da Daniel Gottschlag. Il pacchetto \`e stato scritto per il Gruppo Utilizzatori Italiani di \TeX{} e \LaTeX{} (\url{http://www.guitex.org/}). - -\selectlanguage{american} - -\endgroup - -\vfill - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex new/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex --- old/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex 2017-03-15 23:01:04.000000000 +0100 @@ -1,20 +1,28 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %******************************************************* % Acknowledgements %******************************************************* \pdfbookmark{Acknowledgements}{Acknowledgements} -\begingroup -\let\clearpage\relax -\let\cleardoublepage\relax -\let\cleardoublepage\relax - \chapter*{Acknowledgements} -I wish first of all to thank the members of the Staff of the Italian \TeX{} and \LaTeX{} User Group, in particular Prof.~Enrico Gregorio, for their invaluable aid during the writing of this work, the detailed explanations, the patience and the precision in the suggestions, the supplied solutions, the competence and the kindness. Thanks also to all the people who have discussed with me on the forum of the Group, prodigal of precious observations and good advices. - -Finally, thanks to Andr\'e Miede, for his wonderful ClassicThesis style, and to Daniel Gottschlag, who gave to me the hint for this original reworking. - -\endgroup - - - +\begin{flushright} +\itshape +We have seen that computer programming is an art, \\ +because it applies accumulated knowledge to the world, \\ +because it requires skill and ingenuity, \\ +and especially because it produces objects of beauty. \\ +\medskip +--- Donald Ervin Knuth +\end{flushright} + +\bigskip +\bigskip + +\heartpar{I wish first of all to thank the members of the Italian \TeX{} and \LaTeX{} User Group, in particular +Claudio Beccari, Fabiano Busdraghi, Gustavo Cevolani, Rosaria D'Addazio, Agostino De Marco, Massimiliano Dominici, Gloria Faccanoni, Claudio Fiandrino, Heinrich Fleck, Enrico Gregorio, Massimo Guiggiani, Roberto Giacomelli, Gianluca Gorni, Maurizio Himmelmann, Jer\'onimo Leal, Paride Legovini, Lapo Filippo Mori, Gianluca Pignalberi, Luigi Scarso, Marco Stara, Andrea Tonelli, Ivan Valbusa, Emiliano Giovanni Vavassori and Emanuele Vicentini, +for their invaluable aid during the writing of this work, the detailed explanations, the patience and the precision in the suggestions, the supplied solutions, the competence and the kindness: thank you, guys! +Thanks also to all the people who have discussed with me on the forum of the Group, prodigal of precious observations and good advices. +Finally, thanks to Andr\'e Miede, for his wonderful ClassicThesis style, and to Daniel Gottschlag, who gave to me the hint for this original reworking.} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Bibliography.tex new/doc/latex/arsclassica/FrontBackMatter/Bibliography.tex --- old/doc/latex/arsclassica/FrontBackMatter/Bibliography.tex 2011-08-07 01:34:47.000000000 +0200 +++ new/doc/latex/arsclassica/FrontBackMatter/Bibliography.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,3 +1,6 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %******************************************************* % Bibliography %******************************************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Contents.tex new/doc/latex/arsclassica/FrontBackMatter/Contents.tex --- old/doc/latex/arsclassica/FrontBackMatter/Contents.tex 2012-02-06 01:42:00.000000000 +0100 +++ new/doc/latex/arsclassica/FrontBackMatter/Contents.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,18 +1,11 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %******************************************************* % Contents %******************************************************* \phantomsection \pdfbookmark{\contentsname}{tableofcontents} \setcounter{tocdepth}{2} -\begingroup - \let\clearpage\relax - \let\cleardoublepage\relax - - \tableofcontents -\endgroup -\markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} - -\begingroup - \let\clearpage\relax - \let\cleardoublepage\relax -\endgroup +\tableofcontents +\markboth{\spacedlowsmallcaps{\contentsname}}{\spacedlowsmallcaps{\contentsname}} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Index.tex new/doc/latex/arsclassica/FrontBackMatter/Index.tex --- old/doc/latex/arsclassica/FrontBackMatter/Index.tex 2011-08-07 01:34:47.000000000 +0200 +++ new/doc/latex/arsclassica/FrontBackMatter/Index.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -%******************************************************* -% Index -%******************************************************* -\manualmark -\markboth{\spacedlowsmallcaps{\indexname}}{\spacedlowsmallcaps{\indexname}} -\phantomsection -\begingroup - \let\clearpage\relax - \let\cleardoublepage\relax - \let\cleardoublepage\relax -\pagestyle{scrheadings} -\addcontentsline{toc}{chapter}{\tocEntry{\indexname}} -\printindex -\endgroup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Titleback.tex new/doc/latex/arsclassica/FrontBackMatter/Titleback.tex --- old/doc/latex/arsclassica/FrontBackMatter/Titleback.tex 2011-08-07 01:34:47.000000000 +0200 +++ new/doc/latex/arsclassica/FrontBackMatter/Titleback.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,26 +1,35 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + %******************************************************* % Titleback %******************************************************* \thispagestyle{empty} +\pdfbookmark{Titleback}{Titleback} \hfill -\vfill +\vspace{\stretch{2}} -\noindent\myName: -\textit{\myTitle,} \mySubTitle, -\textcopyright\ \myTime. +\begin{center} +Lorenzo Pantieri \\ +\smallskip +\textit{The \arsclassica{} package}\\ +\smallskip +Copyright\,\textcopyright\ 2008-2017 +\end{center} +\vspace{\stretch{1}} \medskip -\noindent{\spacedlowsmallcaps{Website}}: \\ -\url{http://www.lorenzopantieri.net/} -\medskip -\noindent{\spacedlowsmallcaps{E-mail}}: \\ -\mail{lorenzo.pantieri(a)iperbole.bologna.it} +\noindent\textsf{\spacedlowsmallcaps{Titleback}} \\ +\noindent +This document was written with \LaTeX{} on Mac using \arsclassica, a reworking of the \classicthesis{} style designed by Andr\'e Miede, inspired to the masterpiece \emph{The Elements of Typographic Style} by Robert Bringhurst. -\vspace{1cm} -\hrule \bigskip -\noindent The titlepage reproduces an engraving of Maurits Cornelis Escher, titled \emph{Plane Filling with Birds} (the picture is obtained from \url{http://www.mcescher.com/}). \ No newline at end of file +\noindent +\textsf{\spacedlowsmallcaps{Contacts}} + +\noindent +{\raisebox{-0.33ex}{\ding{43}}}\,\mail{lorenzo.pantieri(a)gmail.com} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/FrontBackMatter/Titlepage.tex new/doc/latex/arsclassica/FrontBackMatter/Titlepage.tex --- old/doc/latex/arsclassica/FrontBackMatter/Titlepage.tex 2011-08-07 01:34:47.000000000 +0200 +++ new/doc/latex/arsclassica/FrontBackMatter/Titlepage.tex 2017-03-15 23:01:04.000000000 +0100 @@ -1,38 +1,32 @@ +% !TEX TS-program = pdflatex +% !TEX root = ../ArsClassica.tex + +%******************************************************* +% Titlepage +%******************************************************* \begin{titlepage} \pdfbookmark{Titlepage}{Titlepage} \changetext{}{}{}{((\paperwidth - \textwidth) / 2) - \oddsidemargin - \hoffset - 1in}{} -\null\vfill -\begin{center} -\large -\sffamily - -\bigskip - -{\Large\spacedlowsmallcaps{\myName}} \\ - -\bigskip - -{\huge\spacedlowsmallcaps{\myTitle} \\ -} - -\bigskip - -\vspace{9cm} - -\begin{tabular} {cc} -\parbox{0.3\textwidth}{\includegraphics[width=2.5cm]{Birds}} -& -\parbox{0.7\textwidth}{{\Large\spacedlowsmallcaps{\mySubTitle}} \\ - - {\normalsize - - \myGroup \\ - \myUrl \\ - \myTime}} - \end{tabular} -\end{center} -\vfill -\end{titlepage} + \begin{center} + {\LARGE + + \hfill + + \vfill + + {\spacedlowsmallcaps{\myName}} \\ \bigskip + + {\color{Maroon}\spacedallcaps{\myTitle}} + + } + + \vfill + + \includegraphics[width=0.7\textwidth]{TFZSuperEllisse} \\ \bigskip + \mySubTitle + \vfill + \end{center} +\end{titlepage} \ No newline at end of file Binary files old/doc/latex/arsclassica/Graphics/Birds.jpg and new/doc/latex/arsclassica/Graphics/Birds.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Dolor.jpg and new/doc/latex/arsclassica/Graphics/Dolor.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Example_1.jpg and new/doc/latex/arsclassica/Graphics/Example_1.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Example_2.jpg and new/doc/latex/arsclassica/Graphics/Example_2.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Example_3.jpg and new/doc/latex/arsclassica/Graphics/Example_3.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Example_4.jpg and new/doc/latex/arsclassica/Graphics/Example_4.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Ipsum.jpg and new/doc/latex/arsclassica/Graphics/Ipsum.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Lorem.jpg and new/doc/latex/arsclassica/Graphics/Lorem.jpg differ Binary files old/doc/latex/arsclassica/Graphics/Sit.jpg and new/doc/latex/arsclassica/Graphics/Sit.jpg differ Binary files old/doc/latex/arsclassica/Graphics/TFZSuperEllisse.pdf and new/doc/latex/arsclassica/Graphics/TFZSuperEllisse.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/README new/doc/latex/arsclassica/README --- old/doc/latex/arsclassica/README 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/README 2017-03-15 23:01:04.000000000 +0100 @@ -1,38 +1,31 @@ -********************************************************** -* ArsClassica package * -********************************************************** +ArsClassica package +Version March 2017 -Copyright (C) 2008-2012 Lorenzo Pantieri - - http://www.lorenzopantieri.net/ - lorenzo.pantieri(a)iperbole.bologna.it + Copyright (c) 2008-2017 Lorenzo Pantieri + http://www.lorenzopantieri.net/ + lorenzo.pantieri(a)gmail.com License - This software is provided under the terms of the - LaTeX Project Public License distributed from CTAN - archives in directory macros/latex/base/lppl.txt. + This software is provided under the terms of the + LaTeX Project Public License distributed from CTAN + archives in directory macros/latex/base/lppl.txt. Abstract - The package changes some typographical features of - the ClassicThesis style, by Andr Miede. - It allows to reproduce the layout of the guide - "The Art of Writing with LaTeX" (in Italian; - http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf). - The hint for the original ewroking of - ClassicThesis was given to me by Daniel Gottschlag. - The package was written for the Italian TeX and LaTeX User - Group (GuIT, http://www.guitex.org/). - Your comments are highly appreciated. + This package changes some typographical features of + ClassicThesis, by Andre Miede, inspired to the masterpiece + "The Elements of Typographic Style" by Robert Bringhurst. + It allows to reproduce the layout of the guide + "The Art of Writing with LaTeX" (in Italian, + http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf). + Your comments are highly appreciated. Installation - Move arsclassica.sty into a directory searched - by LaTeX. If necessary, refresh the database - to finish installation. - To produce the documentation, run ArsClassica.tex - through pdfLaTeX. \ No newline at end of file + This package is preinstalled in TeX Live and MiKTeX complete. + To produce the documentation, run ArsClassica.tex + through pdfLaTeX. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/arsclassica/arsclassica-settings.tex new/doc/latex/arsclassica/arsclassica-settings.tex --- old/doc/latex/arsclassica/arsclassica-settings.tex 2012-02-22 01:16:30.000000000 +0100 +++ new/doc/latex/arsclassica/arsclassica-settings.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,257 +1,82 @@ % ******************************************************************** -% arsclassica-settings -% ******************************************************************** - +% Personal commands +% ******************************************************************** +\newcommand{\myName}{Lorenzo Pantieri} +\newcommand{\myTitle}{The ArsClassica package} +\newcommand{\mySubTitle}{Ah homage to the Elements of Typographic Style} +\DeclareRobustCommand*{\clsname}[1]{{\normalfont\sffamily#1}} +\DeclareRobustCommand*{\pkgname}[1]{{\normalfont\sffamily#1}} +\DeclareRobustCommand*{\optname}[1]{{\normalfont\ttfamily#1}} +\DeclareRobustCommand*{\cmdname}[1]{\mbox{\lstinline[basicstyle=\normalsize\ttfamily]!\\#1!}} -\newcommand{\myName}{Lorenzo Pantieri} -\newcommand{\myTitle}{Customizing ClassicThesis with the ArsClassica package} -\newcommand{\mySubTitle}{User Manual} -\newcommand{\myLocation}{Cesena} -\newcommand{\myGroup}{Italian \TeX{} and \LaTeX{} User Group} -\newcommand{\myUrl}{\url{http://www.guitex.org/}} -\newcommand{\myTime}{2012, February} +\DeclareRobustCommand*{\classicthesis}{Classic\-Thesis} +\DeclareRobustCommand*{\arsclassica}{{\normalfont\sffamily ArsClassica}} % ******************************************************************** -% hyperref +% Hyper-references % ******************************************************************** \newcommand{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} % ******************************************************************** -% makeidx, multicol +% Graphics % ******************************************************************** -\let\orgtheindex\theindex -\let\orgendtheindex\endtheindex -\def\theindex{% - \def\twocolumn{\begin{multicols}{2}}% - \def\onecolumn{}% - \clearpage - \orgtheindex -} -\def\endtheindex{% - \end{multicols}% - \orgendtheindex -} - -\makeindex +\graphicspath{{Graphics/}} % ******************************************************************** -% listings +% Code % ******************************************************************** - \definecolor{lightergray}{gray}{0.99} \lstset{language=[LaTeX]Tex, - keywordstyle=\color{RoyalBlue}, - basicstyle=\normalfont\ttfamily, - commentstyle=\color{Emerald}\ttfamily, - stringstyle=\rmfamily, - numbers=none, - numberstyle=\scriptsize, - stepnumber=5, - numbersep=8pt, - showstringspaces=false, - breaklines=true, - frameround=ftff, - frame=lines, - backgroundcolor=\color{lightergray} + keywordstyle=\color{RoyalBlue}, + basicstyle=\small\ttfamily, + commentstyle=\color{Emerald}\ttfamily, + stringstyle=\rmfamily, + numberstyle=\scriptsize, + showstringspaces=false, + breaklines=true, + frame=lines, + backgroundcolor=\color{lightergray}, + flexiblecolumns=true, + escapeinside={£*}{*£}, + firstnumber=last, } -\lstset{ morekeywords=% - {RequirePackage,newboolean,DeclareOption,setboolean,% - ProcessOptions,PackageError,ifthenelse,boolean,% - chapterNumber,sodef,textls,allcapsspacing,% - MakeTextLowercase,orgtheindex,endtheindex,% - @ifpackageloaded,undefined,sfdefault,% - DeclareRobustCommand,spacedallcaps,% - microtypesetup,MakeTextUppercase,lowsmallcapsspacing,% - lowsmallcapsspacing,spacedlowsmallcaps, - spacedlowsmallcaps,lehead,headmark,color,% - headfont,partname,thepart,titleformat,part, - titlerule,chapter,thechapter,thesection,% - subsection,thesubsection,thesubsubsection,% - paragraph,theparagraph,descriptionlabel,titlespacing,% - graffito,lineskiplimit,finalhyphendemerits,% - colorbox,captionsetup,labelitemi,% - myincludegraphics,hypersetup,setlength,% - definecolor,lsstyle,textssc,subsubsection,% - graffito@setup,includegraphics,ifdefined,% - myTitle,textcopyright,myName,lstset,lstnewenvironment,% - setkeys,lst@BeginAlsoWriteFile,contentsname,% - toc@heading,@ppljLaTeX,z@,check@mathfonts,% - sf@size,ptctitle,mtctitle,stctitle,lst@intname,% - @empty,math@fontsfalse,@ppljscTeX,@iwonaTeX,% - @iwonascLaTeX,@ctTeX,tw@,ct@sc,@ctTeX,f@family,% - f@shape,ct@sc,ctLaTeX,ctLaTeXe,@twoe,@sctwoe,% - texorpdfstring,m@th,ctTeX,@mkboth,ProvidesPackage,% - theindex,PackageInfo,PackageWarningNoLine,% - mtifont,mtcindent,@iwonaLaTeX,@ppljTeX,@iwonascTeX,% - rohead,orgendtheindex,@ppljscLaTeX,% - @ifclassloaded,toc@headingbkORrp,backreftwosep,% - backrefalt,backreflastsep,areaset,pnumfont,% - arsincludegraphics,ExecuteOptions,PackageWarning,textcolor,% - MessageBreak,ars@@includegraphics,ifcld@backref,rofoot,formatchapter,% - if@twoside}, - commentstyle=\color{Emerald}\ttfamily,% - frame=lines} - -\lstset{basicstyle=\normalfont\ttfamily} -\lstset{flexiblecolumns=true} -\lstset{moredelim={[is][\normalfont\itshape]{/*}{*/}}} -\lstset{basicstyle=\normalfont\ttfamily} -\lstset{flexiblecolumns=false} -\lstset{moredelim={[is][\ttfamily]{!?}{?!}}} -\lstset{escapeinside={£*}{*£}} -\lstset{firstnumber=last} -\lstset{moredelim={[is][\ttfamily]{!?}{?!}}} - -\DeclareRobustCommand*{\pacchetto}[1]{{\normalfont\ttfamily#1}% -\index{Pacchetto!#1@\texttt{#1}}% -\index{#1@\texttt{#1}}} - -\DeclareRobustCommand*{\bibtex}{\textsc{Bib}\TeX% -\index{bibtex@\textsc{Bib}\protect\TeX}% -} - -\DeclareRobustCommand*{\amseuler}{\protect\AmS{} Euler% -\index{AmS Euler@\protect\AmS~Euler}% -\index{Font!AmS Euler@\protect\AmS~Euler}} - -\lstnewenvironment{code}% -{\setkeys{lst}{columns=fullflexible,keepspaces=true}% -\lstset{basicstyle=\small\ttfamily}% -}{} - -\lstset{extendedchars} -\lstnewenvironment{sidebyside}{% - \global\let\lst@intname\@empty - \setbox\z@=\hbox\bgroup - \setkeys{lst}{columns=fullflexible,% - linewidth=0.45\linewidth,keepspaces=true,% - breaklines=true,% - breakindent=0pt,% - boxpos=t,% - basicstyle=\small\ttfamily -}% - \lst(a)BeginAlsoWriteFile{\jobname.tmp}% -}{% - \lst@EndWriteFile\egroup - \begin{center}% - \begin{minipage}{0.45\linewidth}% - \hbox to\linewidth{\box\z@\hss} - \end{minipage}% - \qquad - \begin{minipage}{0.45\linewidth}% - \setkeys{lst}{frame=none}% - \leavevmode \catcode`\^^M=5\relax - \small\input{\jobname.tmp}% - \end{minipage}% - \end{center}% -} - -\newcommand{\omissis}{[\dots\negthinspace]} - -\graphicspath{{Graphics/}} - -\hyphenation{Robert Bring-hurst DejaVu -Bera Mono Vera Classic-Thesis suite Knuth Zapf} - \newcommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} -\lstset{escapeinside={£*}{*£}} - -\DeclareRobustCommand*{\miktex}{MiK\TeX% -\index{miktex@MiK\protect\TeX}% -} - -\DeclareRobustCommand*{\metafont}{\MF% -\index{METAFONT@\protect\MF}% -} - -\DeclareRobustCommand*{\metapost}{\MP% -\index{METAPOST@\protect\MP}% -} +\lstset{ morekeywords=% + {ProvidesPackage,RequirePackage,areaset,ifthenelse,% + chapterNumber,undefined,boolean,DeclareRobustCommand,% + spacedallcaps,textssc,MakeTextUppercase,lehead,% + microtypesetup,textls,spacedlowsmallcaps,MakeTextLowercase,% + sodef,allcapsspacing,lowsmallcapsspacing,thesection,% + color,headmark,rohead,headfont,pnumfont,titleformat,% + part,partname,thepart,chapter,thechapter,titlerule,% + subsection,thesubsection,subsubsection,thesubsubsection,% + paragraph,theparagraph,descriptionlabel,titlespacing,% + formatchapter,textcolor,clearscrplain,rofoot,labelitemi, + captionsetup,hypersetup}} -\DeclareRobustCommand*{\texlive}{\TeX{}~Live% -\index{texlive@\protect\TeX{}~Live}% -} +\lstnewenvironment{code}% + {\setkeys{lst}{columns=fullflexible,keepspaces=true}% + \lstset{basicstyle=\small\ttfamily}}{} % ******************************************************************** -% biblatex +% Bibliography % ******************************************************************** - \bibliography{Bibliography} -\renewcommand{\nameyeardelim}{, } - \defbibheading{bibliography}{% \cleardoublepage \manualmark \phantomsection \addcontentsline{toc}{chapter}{\tocEntry{\bibname}} \chapter*{\bibname\markboth{\spacedlowsmallcaps{\bibname}} -{\spacedlowsmallcaps{\bibname}}}} - - \DeclareCiteCommand{\citeyearpar}[\mkbibparens] - {\boolfalse{citetracker}% - \boolfalse{pagetracker}% - \usebibmacro{prenote}} - {\printtext[bibhyperref]{\printfield{year}}} - {\multicitedelim} - {\usebibmacro{postnote}} - -\makeatletter - \DeclareCiteCommand{\citetalias} - {\usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \bibhyperref{\@citealias{\thefield{entrykey}}}} - {\multicitedelim} - {\usebibmacro{postnote}} -\makeatother - -\setcounter{biburlnumpenalty}{9000} -\setcounter{biburlucpenalty}{9000} -\setcounter{biburllcpenalty}{9000} - - -% ******************************************************************** -% other commands -% ******************************************************************** - -\newcommand{\ita}[1]{% - \begin{otherlanguage*}{italian}#1\end{otherlanguage*}} - -\DeclareRobustCommand*{\pkgname}[1]{{\normalfont\sffamily#1}% -\index{Package!#1@\textsf{#1}}% -\index{#1@\textsf{#1}}} - -\DeclareRobustCommand*{\envname}[1]{{\normalfont\ttfamily#1}% -\index{Environment!#1@\texttt{#1}}% -\index{#1@\texttt{#1}}} - -\DeclareRobustCommand*{\optname}[1]{{\normalfont\ttfamily#1}% -\index{Option!#1@\texttt{#1}}% -\index{#1@\texttt{#1}}} - -\DeclareRobustCommand*{\clsname}[1]{{\normalfont\sffamily#1}% -\index{Class!#1@\textsf{#1}}% -\index{#1@\textsf{#1}}} - -\DeclareRobustCommand*{\cmdname}[1]{\mbox{\lstinline!\\#1!}% -\index{#1(a)\texttt{\hspace*{-1.2ex}\textbackslash#1}}} - -\DeclareRobustCommand*{\classicthesis}{Classic\-Thesis} - -\DeclareRobustCommand*{\arsclassica}{{\normalfont\sffamily ArsClassica}} - -\DeclareRobustCommand*{\miktex}{MiK\TeX% -\index{miktex@MiK\protect\TeX}} - -\DeclareRobustCommand*{\texlive}{\TeX{}~Live% -\index{texlive@\protect\TeX{}~Live}} - +{\spacedlowsmallcaps{\bibname}}}} +\renewcommand*{\nameyeardelim}{\addcomma\space} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arsclassica.doc.tlpobj new/tlpkg/tlpobj/arsclassica.doc.tlpobj --- old/tlpkg/tlpobj/arsclassica.doc.tlpobj 2016-04-14 18:35:52.000000000 +0200 +++ new/tlpkg/tlpobj/arsclassica.doc.tlpobj 2017-04-14 17:28:36.000000000 +0200 @@ -1,26 +1,24 @@ name arsclassica.doc category Package -revision 25466 +revision 43509 shortdesc doc files of arsclassica relocated 1 docfiles size=125 RELOC/doc/latex/arsclassica/ArsClassica.pdf RELOC/doc/latex/arsclassica/ArsClassica.tex RELOC/doc/latex/arsclassica/Bibliography.bib - RELOC/doc/latex/arsclassica/CHANGES + RELOC/doc/latex/arsclassica/Changes RELOC/doc/latex/arsclassica/Chapters/Code.tex RELOC/doc/latex/arsclassica/Chapters/Fundamentals.tex - RELOC/doc/latex/arsclassica/FrontBackMatter/Abstract+Sommario.tex RELOC/doc/latex/arsclassica/FrontBackMatter/Acknowledgements.tex RELOC/doc/latex/arsclassica/FrontBackMatter/Bibliography.tex RELOC/doc/latex/arsclassica/FrontBackMatter/Contents.tex - RELOC/doc/latex/arsclassica/FrontBackMatter/Index.tex RELOC/doc/latex/arsclassica/FrontBackMatter/Titleback.tex RELOC/doc/latex/arsclassica/FrontBackMatter/Titlepage.tex - RELOC/doc/latex/arsclassica/Graphics/Birds.jpg - RELOC/doc/latex/arsclassica/Graphics/Example_1.jpg - RELOC/doc/latex/arsclassica/Graphics/Example_2.jpg - RELOC/doc/latex/arsclassica/Graphics/Example_3.jpg - RELOC/doc/latex/arsclassica/Graphics/Example_4.jpg + RELOC/doc/latex/arsclassica/Graphics/Dolor.jpg + RELOC/doc/latex/arsclassica/Graphics/Ipsum.jpg + RELOC/doc/latex/arsclassica/Graphics/Lorem.jpg + RELOC/doc/latex/arsclassica/Graphics/Sit.jpg + RELOC/doc/latex/arsclassica/Graphics/TFZSuperEllisse.pdf RELOC/doc/latex/arsclassica/README RELOC/doc/latex/arsclassica/arsclassica-settings.tex ++++++ arsclassica.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/arsclassica/classic.ist new/makeindex/arsclassica/classic.ist --- old/makeindex/arsclassica/classic.ist 2012-02-06 01:42:00.000000000 +0100 +++ new/makeindex/arsclassica/classic.ist 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -headings_flag 1 -heading_prefix "\\goodbreak\\textsc{" -heading_suffix "}\\par\\nobreak\\vskip\\smallskipamount\\nobreak" -symhead_positive "Simboli" -symhead_negative "simboli" -numhead_positive "Numeri" -numhead_negative "numeri" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/arsclassica/arsclassica.sty new/tex/latex/arsclassica/arsclassica.sty --- old/tex/latex/arsclassica/arsclassica.sty 2012-02-22 01:16:30.000000000 +0100 +++ new/tex/latex/arsclassica/arsclassica.sty 2017-03-15 23:01:05.000000000 +0100 @@ -1,15 +1,22 @@ %************************************************************ % arsclassica.sty % -% copyright (C) 2008-2012 Lorenzo Pantieri +% copyright (C) 2008-2017 Lorenzo Pantieri % http://www.lorenzopantieri.net/ % %************************************************************ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{arsclassica}[2012/02/21 v4.0 Customizing ClassicThesis (LP)] +\ProvidesPackage{arsclassica}[2017/02/01] \RequirePackage{classicthesis} \RequirePackage{caption} + +%************************************************************ +% Text body +%************************************************************ +\areaset[current]{370pt}{784pt} + + %************************************************************ % Iwona %************************************************************ @@ -108,18 +115,18 @@ {1em}{\spacedlowsmallcaps} % subsections \titleformat{\subsection} - {\normalfont\sffamily}{\textsc{\MakeTextLowercase% - {\thesubsection}}}{1em}{\normalsize} + {\normalfont\sffamily\bfseries}{\textsc{\MakeTextLowercase% + {\thesubsection}}}{1em}{\normalsize} % subsubsections \titleformat{\subsubsection} - {\normalfont\sffamily\itshape}{\textsc% - {\MakeTextLowercase{\thesubsubsection}}}% - {1em}{\normalsize\itshape} + {\normalfont\sffamily\bfseries\itshape}{\textsc% + {\MakeTextLowercase{\thesubsubsection}}}% + {1em}{\normalsize\itshape} % paragraphs \titleformat{\paragraph}[runin] - {\normalfont\normalsize\sffamily}{\textsc% - {\MakeTextLowercase{\theparagraph}}}% - {0pt}{\spacedlowsmallcaps} + {\normalfont\normalsize\sffamily\bfseries}{\textsc% + {\MakeTextLowercase{\theparagraph}}}% + {0pt}{\spacedlowsmallcaps} % descriptionlabels \renewcommand{\descriptionlabel}[1]{\hspace*{\labelsep}% \bfseries\spacedlowsmallcaps{#1}} @@ -143,7 +150,8 @@ \hspace{10pt}\vline\ }{10pt} {\formatchapter} % - \if@twoside\rofoot[\mbox{\makebox[0pt][l]{\kern1em\thepage}}]{}\fi + \clearscrplain + \rofoot[\mbox{\makebox[0pt][l]{\kern1em\thepage}}]{} %************************************************************ @@ -160,18 +168,6 @@ %************************************************************ -% graphicx, xcolor -%************************************************************ -\definecolor{aliceblue}{RGB}{240,248,255} - -\let\ars@@includegraphics\includegraphics -\newcommand{\arsincludegraphics}[2][]{% - \begingroup\setlength{\fboxsep}{0pt}% - \colorbox{aliceblue}{\ars@@includegraphics[#1]{#2}}% - \endgroup} - - -%************************************************************ % hyperref %************************************************************ \hypersetup{% @@ -185,98 +181,6 @@ urlcolor=webbrown, linkcolor=RoyalBlue, citecolor=webgreen,% hyperfootnotes=false,pdfpagelabels, - pdfsubject={},% - pdfkeywords={},% pdfcreator={pdfLaTeX},% - pdfproducer={LaTeX with hyperref and ClassicThesis}% -} - - -%************************************************************ -% minitoc -%************************************************************ -\@ifpackageloaded{minitoc} -{% - \MakeLowercase{\gdef\noexpand\ptctitle{\ptctitle}} - \MakeLowercase{\gdef\noexpand\mtctitle{\mtctitle}} - \MakeLowercase{\gdef\noexpand\stctitle{\stctitle}} - \setlength{\mtcindent}{0pt} - \renewcommand{\mtifont}{\normalsize\sffamily - \scshape\lsstyle} -} -{} - - -%************************************************************ -% \ctLaTeX, \ctLaTeXe, \ctTeX -%************************************************************ -\def\@ppljLaTeX{{\upshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont A}% - \sbox\tw@ T% - L\kern-.55\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.25\wd0 - \@ctTeX}} -\def\@ppljTeX{{\upshape T\kern -.08em \lower .3ex\hbox{E}% -\kern -.08em X}} - -\def\@ppljscLaTeX{{\upshape\scshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont a}% - \sbox\tw@ t% - l\kern-.6\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.25\wd0 - \@ctTeX}} -\def\@ppljscTeX{{\upshape\scshape t\kern -.085em -\lower .25ex\hbox{e}\kern -.085em x}} - -\def\@iwonaLaTeX{{\upshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse\selectfont A}% - \sbox\tw@ T% - L\kern-.5\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.2\wd0 - \@ctTeX}} -\def\@iwonaTeX{{\upshape T\kern -.12em \lower .3ex\hbox{E}% - \kern -.12em X}} - -\def\@iwonascLaTeX{{\upshape\scshape - \sbox\z@{\check@mathfonts\fontsize\sf@size\z@% - \math@fontsfalse% - \selectfont a}% - \sbox\tw@ t% - l\kern-.5\wd\z@ - \vbox to\ht\tw@{\copy\z@\vss}% - \kern-.2\wd0 - \@ctTeX}} -\def\@iwonascTeX{{\upshape\scshape t\kern -.1em - \lower .25ex\hbox{e}\kern -.1em x}} - -\def\ct@sc{sc} -\def\@ctTeX{\csname @\f@family\ifx\f@shape\ct@sc sc% -\fi TeX\endcsname} - -\DeclareRobustCommand\ctLaTeX{% - \texorpdfstring{\textls[1]{\csname @\f@family\ifx% - \f@shape\ct@sc sc\fi LaTeX\endcsname}}{LaTeX}} -\DeclareRobustCommand\ctLaTeXe{% - \texorpdfstring{\textls[1]{\ctLaTeX\csname @\ifx% - \f@shape\ct@sc sc\fi twoe\endcsname}}{LaTeX2e}} - -\def\@twoe{\kern.1em$\m@th2_{\textstyle\varepsilon}$} -\def\@sctwoe{\kern.15em$\m@th{\scriptscriptstyle2}% -_\varepsilon$} - -\DeclareRobustCommand\ctTeX{% - \texorpdfstring{\textls[1]{\@ctTeX}}{TeX}} - -\def\toc@headingbkORrp{% - \def\toc@heading{% - \chapter*{\contentsname}% - \@mkboth{\spacedlowsmallcaps{\contentsname}} - {\spacedlowsmallcaps{\contentsname}}}} -\@ifclassloaded{scrreprt}{\toc@headingbkORrp}{} -\@ifclassloaded{scrbook}{\toc@headingbkORrp}{} \ No newline at end of file + pdfproducer={LaTeX with ArsClassica}% +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arsclassica.tlpobj new/tlpkg/tlpobj/arsclassica.tlpobj --- old/tlpkg/tlpobj/arsclassica.tlpobj 2016-04-14 18:35:52.000000000 +0200 +++ new/tlpkg/tlpobj/arsclassica.tlpobj 2017-04-14 17:28:37.000000000 +0200 @@ -1,17 +1,16 @@ name arsclassica category Package -revision 25466 +revision 43509 shortdesc A different view of the ClassicThesis package relocated 1 longdesc The package changes some typographical points of the longdesc ClassicThesis style, by Andre Miede. It enables the user to longdesc reproduce the look of the guide The art of writing with LaTeX longdesc (the web page is in Italian). -runfiles size=4 - RELOC/makeindex/arsclassica/classic.ist +runfiles size=2 RELOC/tex/latex/arsclassica/arsclassica.sty catalogue-ctan /macros/latex/contrib/arsclassica -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-15 16:24:45 +0100 catalogue-license lppl catalogue-topics dissertation -catalogue-version 4.0.3 +catalogue-version March 2017 ++++++ articleingud.doc.tar.xz ++++++ ++++++ articleingud.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/articleingud.tlpobj new/tlpkg/tlpobj/articleingud.tlpobj --- old/tlpkg/tlpobj/articleingud.tlpobj 2016-04-14 18:35:53.000000000 +0200 +++ new/tlpkg/tlpobj/articleingud.tlpobj 2017-04-14 17:28:37.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=5 RELOC/tex/latex/articleingud/articleingud.cls catalogue-ctan /macros/latex/contrib/articleingud -catalogue-date 2015-10-30 17:08:07 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics spanish journalpub class catalogue-version 0.3 ++++++ arydshln.doc.tar.xz ++++++ ++++++ arydshln.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arydshln.tlpobj new/tlpkg/tlpobj/arydshln.tlpobj --- old/tlpkg/tlpobj/arydshln.tlpobj 2016-05-03 03:15:20.000000000 +0200 +++ new/tlpkg/tlpobj/arydshln.tlpobj 2017-04-14 17:28:37.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=12 RELOC/tex/latex/arydshln/arydshln.sty catalogue-ctan /macros/latex/contrib/arydshln -catalogue-date 2016-04-29 14:56:54 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics alignment-supp catalogue-version 1.73 ++++++ asaetr.doc.tar.xz ++++++ ++++++ asaetr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asaetr.tlpobj new/tlpkg/tlpobj/asaetr.tlpobj --- old/tlpkg/tlpobj/asaetr.tlpobj 2016-04-14 18:35:54.000000000 +0200 +++ new/tlpkg/tlpobj/asaetr.tlpobj 2017-04-14 17:28:37.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/asaetr/asaetr.cls RELOC/tex/latex/asaetr/asaetr.sty catalogue-ctan /macros/latex/contrib/asaetr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics journalpub class catalogue-version 1.0a ++++++ asapsym.doc.tar.xz ++++++ ++++++ asapsym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asapsym.tlpobj new/tlpkg/tlpobj/asapsym.tlpobj --- old/tlpkg/tlpobj/asapsym.tlpobj 2016-04-14 18:35:54.000000000 +0200 +++ new/tlpkg/tlpobj/asapsym.tlpobj 2017-04-14 17:28:37.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/asapsym/asapsym.sty RELOC/tex/plain/asapsym/asapsym.code.tex catalogue-ctan /fonts/asapsym -catalogue-date 2016-03-30 06:22:42 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-symbol font-otf catalogue-version 1.0 ++++++ ascelike.doc.tar.xz ++++++ ++++++ ascelike.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ascelike.tlpobj new/tlpkg/tlpobj/ascelike.tlpobj --- old/tlpkg/tlpobj/ascelike.tlpobj 2016-04-14 18:35:55.000000000 +0200 +++ new/tlpkg/tlpobj/ascelike.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/bibtex/bst/ascelike/ascelike.bst RELOC/tex/latex/ascelike/ascelike.cls catalogue-ctan /macros/latex/contrib/ascelike -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics confproc journalpub class catalogue-version 2.3 ++++++ ascii-chart.doc.tar.xz ++++++ ++++++ ascii-font.doc.tar.xz ++++++ ++++++ ascii-font.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ascii-font.tlpobj new/tlpkg/tlpobj/ascii-font.tlpobj --- old/tlpkg/tlpobj/ascii-font.tlpobj 2016-04-14 18:35:55.000000000 +0200 +++ new/tlpkg/tlpobj/ascii-font.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/fonts/type1/public/ascii-font/ASCII.pfb RELOC/tex/latex/ascii-font/ascii.sty catalogue-ctan /fonts/ascii -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-symbol font-type1 catalogue-version 2.0 ++++++ asciilist.doc.tar.xz ++++++ ++++++ asciilist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asciilist.tlpobj new/tlpkg/tlpobj/asciilist.tlpobj --- old/tlpkg/tlpobj/asciilist.tlpobj 2016-05-16 00:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/asciilist.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=3 RELOC/tex/latex/asciilist/asciilist.sty catalogue-ctan /macros/latex/contrib/asciilist -catalogue-date 2016-05-15 14:09:28 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics list list-bull list-descr list-enum list-supp catalogue-version 2.2 ++++++ askmaps.doc.tar.xz ++++++ ++++++ askmaps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/askmaps.tlpobj new/tlpkg/tlpobj/askmaps.tlpobj --- old/tlpkg/tlpobj/askmaps.tlpobj 2016-04-14 18:35:56.000000000 +0200 +++ new/tlpkg/tlpobj/askmaps.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/askmaps/askmaps.sty catalogue-also karnaugh catalogue-ctan /macros/latex/contrib/askmaps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics engineering maths catalogue-version 0.1 ++++++ aspectratio.doc.tar.xz ++++++ ++++++ aspectratio.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aspectratio.tlpobj new/tlpkg/tlpobj/aspectratio.tlpobj --- old/tlpkg/tlpobj/aspectratio.tlpobj 2016-04-14 18:35:56.000000000 +0200 +++ new/tlpkg/tlpobj/aspectratio.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -68,7 +68,7 @@ RELOC/fonts/type1/public/aspectratio/artti10.pfb RELOC/tex/latex/aspectratio/ar.sty catalogue-ctan /macros/latex/contrib/aspectratio -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-specialist font-type1 font-mf catalogue-version 2.0 ++++++ assignment.doc.tar.xz ++++++ ++++++ assignment.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/assignment.tlpobj new/tlpkg/tlpobj/assignment.tlpobj --- old/tlpkg/tlpobj/assignment.tlpobj 2016-04-14 18:35:56.000000000 +0200 +++ new/tlpkg/tlpobj/assignment.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=2 RELOC/tex/latex/assignment/assignment.cls catalogue-ctan /macros/latex/contrib/assignment -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics essay class ++++++ assoccnt.doc.tar.xz ++++++ ++++++ assoccnt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/assoccnt.tlpobj new/tlpkg/tlpobj/assoccnt.tlpobj --- old/tlpkg/tlpobj/assoccnt.tlpobj 2016-04-14 18:35:57.000000000 +0200 +++ new/tlpkg/tlpobj/assoccnt.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/assoccnt/assoccnt.sty catalogue-also xassoccnt catalogue-ctan /macros/latex/contrib/assoccnt -catalogue-date 2015-11-07 09:28:08 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics counter-mgmt macro-supp catalogue-version 0.8 ++++++ astro.doc.tar.xz ++++++ ++++++ astro.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/astro.tlpobj new/tlpkg/tlpobj/astro.tlpobj --- old/tlpkg/tlpobj/astro.tlpobj 2016-04-14 18:35:57.000000000 +0200 +++ new/tlpkg/tlpobj/astro.tlpobj 2017-04-14 17:28:38.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/fonts/source/public/astro/astrosym.xtr RELOC/fonts/tfm/public/astro/astrosym.tfm catalogue-ctan /fonts/astro -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics astronomy catalogue-version 2.20 ++++++ asyfig.doc.tar.xz ++++++ ++++++ asyfig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asyfig.tlpobj new/tlpkg/tlpobj/asyfig.tlpobj --- old/tlpkg/tlpobj/asyfig.tlpobj 2016-04-14 18:35:57.000000000 +0200 +++ new/tlpkg/tlpobj/asyfig.tlpobj 2017-04-14 17:28:39.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/asyfig/asyfig.sty RELOC/tex/latex/asyfig/asyprocess.sty catalogue-ctan /macros/latex/contrib/asyfig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use catalogue-version 0.1c ++++++ asymptote-by-example-zh-cn.doc.tar.xz ++++++ ++++++ asymptote-faq-zh-cn.doc.tar.xz ++++++ ++++++ asymptote-manual-zh-cn.doc.tar.xz ++++++ ++++++ asymptote.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/asymptote/CAD.pdf and new/texmf-dist/doc/asymptote/CAD.pdf differ Binary files old/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf and new/texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf differ Binary files old/texmf-dist/doc/asymptote/asy-latex.pdf and new/texmf-dist/doc/asymptote/asy-latex.pdf differ Binary files old/texmf-dist/doc/asymptote/asyRefCard.pdf and new/texmf-dist/doc/asymptote/asyRefCard.pdf differ Binary files old/texmf-dist/doc/asymptote/asymptote.pdf and new/texmf-dist/doc/asymptote/asymptote.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/asymptote/examples/BezierSaddle.asy new/texmf-dist/doc/asymptote/examples/BezierSaddle.asy --- old/texmf-dist/doc/asymptote/examples/BezierSaddle.asy 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/asymptote/examples/BezierSaddle.asy 2017-04-16 19:27:26.000000000 +0200 @@ -0,0 +1,29 @@ +import three; + +size(300); + +patch p=patch(unstraighten(unitplane.s[0].external())); + +p.P[3][0]+=(0,0,1); + +p.P[1][0]+=(0,0,1/3); +p.P[2][0]+=(0,0,2/3); +p.P[3][1]+=(0,0,2/3); +p.P[3][2]+=(0,0,1/3); + +p.P[2][1]=interp(p.P[2][0],p.P[2][3],1/3); +p.P[2][2]=interp(p.P[2][0],p.P[2][3],2/3); + +p.P[1][1]=interp(p.P[1][0],p.P[1][3],1/3); +p.P[1][2]=interp(p.P[1][0],p.P[1][3],2/3); + +draw(surface(p),red+opacity(0.75)); + +void dot(triple[][] P) { + for(int i=0; i < 4; ++i) + for(int j=0; j < 4; ++j) { + draw(string(i)+","+string(j),P[i][j],linewidth(1mm)); + } +} + +dot(surface(p).s[0].P); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/asymptote/examples/colorpatch.asy new/texmf-dist/doc/asymptote/examples/colorpatch.asy --- old/texmf-dist/doc/asymptote/examples/colorpatch.asy 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/asymptote/examples/colorpatch.asy 2017-04-16 19:27:26.000000000 +0200 @@ -0,0 +1,18 @@ +import three; +currentlight=Viewport; + +size(10cm); + +surface s=surface(patch(new triple[][] { + {(0,0,0),(1,0,0),(1,0,0),(2,0,0)}, + {(0,1,0),(1,0,1),(1,0,1),(2,1,0)}, + {(0,1,0),(1,0,-1),(1,0,-1),(2,1,0)}, + {(0,2,0),(1,2,0),(1,2,0),(2,2,0)}})); + +s.s[0].colors=new pen[] {red,green,blue,black}; +draw(s,nolight); + +surface t=shift(Z)*unitplane; +t.s[0].colors=new pen[] {red,green,blue,black}; + +draw(t,nolight); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/asymptote/examples/washermethod.asy new/texmf-dist/doc/asymptote/examples/washermethod.asy --- old/texmf-dist/doc/asymptote/examples/washermethod.asy 2010-07-14 03:03:58.000000000 +0200 +++ new/texmf-dist/doc/asymptote/examples/washermethod.asy 2017-04-16 19:27:26.000000000 +0200 @@ -5,7 +5,7 @@ pen color1=green+opacity(0.25); pen color2=red; -real alpha=250; +real alpha=240; real f(real x) {return 2x^2-x^3;} pair F(real x) {return (x,f(x));} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/asy-faq.info new/texmf-dist/doc/info/asy-faq.info --- old/texmf-dist/doc/info/asy-faq.info 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/doc/info/asy-faq.info 2017-04-16 19:27:26.000000000 +0200 @@ -10,7 +10,7 @@ File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir) ASYMPTOTE FREQUENTLY ASKED QUESTIONS - 12 May 2016 + 22 Mar 2017 This is the list of Frequently Asked Questions about Asymptote (asy). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/asymptote.info new/texmf-dist/doc/info/asymptote.info --- old/texmf-dist/doc/info/asymptote.info 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/doc/info/asymptote.info 2017-04-16 19:27:26.000000000 +0200 @@ -1,7 +1,7 @@ This is asymptote.info, produced by makeinfo version 6.0 from asymptote.texi. -This file documents 'Asymptote', version 2.38. +This file documents 'Asymptote', version 2.41. <http://asymptote.sourceforge.net> @@ -22,7 +22,7 @@ Asymptote ********* -This file documents 'Asymptote', version 2.38. +This file documents 'Asymptote', version 2.41. <http://asymptote.sourceforge.net> @@ -4454,6 +4454,14 @@ real[] a={2.5,-3.5}; int[] b=(int []) a; write(stdout,b); // Outputs 2,-3 + In situations where casting from a string to a type 'T' fails, an +uninitialized variable is returned; this condition can be detected with +the function 'bool initialized(T);' +int i=(int) "2.5"; +assert(initialized(i),"Invalid cast."); + +real x=(real) "2.5a"; +assert(initialized(x),"Invalid cast."); Casting to user-defined types is also possible using 'operator cast': struct rpair { @@ -4476,9 +4484,9 @@ convert them to reals, one would first want to multiply them by 100. However, the straightforward implementation real operator cast(int x) {return x*100;} - is equivalent to an infinite recursion, since the result 'x*100' -needs itself to be cast from an integer to a real. Instead, we want to -use the standard conversion of int to real: +is equivalent to an infinite recursion, since the result 'x*100' needs +itself to be cast from an integer to a real. Instead, we want to use +the standard conversion of int to real: real convert(int x) {return x*100;} real operator cast(int x)=convert; @@ -4741,7 +4749,7 @@ *************** 'Asymptote' comes with a convenient 'LaTeX' style file 'asymptote.sty' -(v1.30 or later required) that makes 'LaTeX' 'Asymptote'-aware. +(v1.33 or later required) that makes 'LaTeX' 'Asymptote'-aware. Entering 'Asymptote' code directly into the 'LaTeX' source file, at the point where it is needed, keeps figures organized and avoids the need to invent new file names for each figure. Simply add the line @@ -9523,8 +9531,8 @@ * 'operator --': graph. (line 30) * 'operator ..': graph. (line 33) * 'operator answer': Interactive mode. (line 35) -* 'operator cast': Casts. (line 30) -* 'operator ecast': Casts. (line 57) +* 'operator cast': Casts. (line 38) +* 'operator ecast': Casts. (line 65) * 'operator init': Variable initializers. (line 6) * 'operator init' <1>: Structures. (line 134) @@ -10159,78 +10167,78 @@ Ref: solve174762 Node: Slices178901 Node: Casts182809 -Node: Import184780 -Node: Static190027 -Node: LaTeX usage192920 -Node: Base modules199425 -Node: plain201982 -Node: simplex202656 -Node: math202930 -Node: interpolate205639 -Node: geometry205918 -Node: trembling206512 -Node: stats206781 -Node: patterns207041 -Node: markers207277 -Node: tree209137 -Node: binarytree209322 -Node: drawtree209988 -Node: syzygy210189 -Node: feynman210463 -Node: roundedpath210738 -Node: animation211021 -Ref: animate211442 -Node: embed212559 -Node: slide213514 -Node: MetaPost213855 -Node: unicode214574 -Node: latin1215448 -Node: babel215817 -Node: labelpath216047 -Node: labelpath3216868 -Node: annotate217179 -Node: CAD217649 -Node: graph217960 -Ref: ticks225110 -Ref: pathmarkers238742 -Ref: marker239212 -Ref: markuniform239566 -Ref: errorbars241364 -Ref: automatic scaling245648 -Node: palette256924 -Ref: images257042 -Ref: image261216 -Ref: logimage261736 -Ref: penimage262841 -Ref: penfunctionimage263103 -Node: three263874 -Ref: PostScript3D290883 -Node: obj292622 -Node: graph3292871 -Ref: GaussianSurface298150 -Node: grid3299299 -Node: solids300083 -Node: tube301075 -Node: flowchart303309 -Node: contour307917 -Node: contour3313228 -Node: smoothcontour3313541 -Node: slopefield315260 -Node: ode316748 -Node: Options317005 -Ref: configuration file323168 -Ref: settings323168 -Ref: texengines324411 -Ref: convert324411 -Node: Interactive mode327734 -Ref: history329883 -Node: GUI331187 -Node: GUI installation331738 -Node: GUI usage332649 -Node: PostScript to Asymptote333557 -Node: Help334315 -Node: Debugger335969 -Node: Credits337725 -Node: Index338707 +Node: Import185076 +Node: Static190323 +Node: LaTeX usage193216 +Node: Base modules199721 +Node: plain202278 +Node: simplex202952 +Node: math203226 +Node: interpolate205935 +Node: geometry206214 +Node: trembling206808 +Node: stats207077 +Node: patterns207337 +Node: markers207573 +Node: tree209433 +Node: binarytree209618 +Node: drawtree210284 +Node: syzygy210485 +Node: feynman210759 +Node: roundedpath211034 +Node: animation211317 +Ref: animate211738 +Node: embed212855 +Node: slide213810 +Node: MetaPost214151 +Node: unicode214870 +Node: latin1215744 +Node: babel216113 +Node: labelpath216343 +Node: labelpath3217164 +Node: annotate217475 +Node: CAD217945 +Node: graph218256 +Ref: ticks225406 +Ref: pathmarkers239038 +Ref: marker239508 +Ref: markuniform239862 +Ref: errorbars241660 +Ref: automatic scaling245944 +Node: palette257220 +Ref: images257338 +Ref: image261512 +Ref: logimage262032 +Ref: penimage263137 +Ref: penfunctionimage263399 +Node: three264170 +Ref: PostScript3D291179 +Node: obj292918 +Node: graph3293167 +Ref: GaussianSurface298446 +Node: grid3299595 +Node: solids300379 +Node: tube301371 +Node: flowchart303605 +Node: contour308213 +Node: contour3313524 +Node: smoothcontour3313837 +Node: slopefield315556 +Node: ode317044 +Node: Options317301 +Ref: configuration file323464 +Ref: settings323464 +Ref: texengines324707 +Ref: convert324707 +Node: Interactive mode328030 +Ref: history330179 +Node: GUI331483 +Node: GUI installation332034 +Node: GUI usage332945 +Node: PostScript to Asymptote333853 +Node: Help334611 +Node: Debugger336265 +Node: Credits338021 +Node: Index339003 End Tag Table Binary files old/texmf-dist/doc/man/man1/asy.man1.pdf and new/texmf-dist/doc/man/man1/asy.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/xasy.man1.pdf and new/texmf-dist/doc/man/man1/xasy.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asymptote.doc.tlpobj new/tlpkg/tlpobj/asymptote.doc.tlpobj --- old/tlpkg/tlpobj/asymptote.doc.tlpobj 2016-05-13 03:15:37.000000000 +0200 +++ new/tlpkg/tlpobj/asymptote.doc.tlpobj 2017-04-17 16:22:30.000000000 +0200 @@ -1,8 +1,8 @@ name asymptote.doc category TLCore -revision 41076 +revision 43843 shortdesc doc files of asymptote -docfiles size=919 +docfiles size=916 texmf-dist/doc/asymptote/CAD.pdf texmf-dist/doc/asymptote/TeXShopAndAsymptote.pdf texmf-dist/doc/asymptote/asy-latex.pdf @@ -11,6 +11,7 @@ texmf-dist/doc/asymptote/examples/100d.views texmf-dist/doc/asymptote/examples/1overx.asy texmf-dist/doc/asymptote/examples/BezierPatch.asy + texmf-dist/doc/asymptote/examples/BezierSaddle.asy texmf-dist/doc/asymptote/examples/BezierSurface.asy texmf-dist/doc/asymptote/examples/BezierTriangle.asy texmf-dist/doc/asymptote/examples/Bode.asy @@ -75,6 +76,7 @@ texmf-dist/doc/asymptote/examples/clockarray.asy texmf-dist/doc/asymptote/examples/coag.asy texmf-dist/doc/asymptote/examples/colons.asy + texmf-dist/doc/asymptote/examples/colorpatch.asy texmf-dist/doc/asymptote/examples/colorplanes.asy texmf-dist/doc/asymptote/examples/colors.asy texmf-dist/doc/asymptote/examples/condor.asy ++++++ asymptote.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/GUI/xasyVersion.py new/texmf-dist/asymptote/GUI/xasyVersion.py --- old/texmf-dist/asymptote/GUI/xasyVersion.py 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/asymptote/GUI/xasyVersion.py 2017-04-16 19:27:26.000000000 +0200 @@ -1,2 +1,2 @@ #!/usr/bin/env python -xasyVersion = "2.38" +xasyVersion = "2.41" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/asy-keywords.el new/texmf-dist/asymptote/asy-keywords.el --- old/texmf-dist/asymptote/asy-keywords.el 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/asymptote/asy-keywords.el 2017-04-16 19:27:26.000000000 +0200 @@ -2,7 +2,7 @@ ;; This file is automatically generated by asy-list.pl. ;; Changes will be overwritten. ;; -(defvar asy-keywords-version "2.38") +(defvar asy-keywords-version "2.41") (defvar asy-keyword-name '( and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator )) @@ -11,7 +11,7 @@ Braid FitResult Label Legend Solution TreeNode abscissa arc arrowhead binarytree binarytreeNode block bool bool3 bounds bqe circle conic coord coordsys cputime ellipse evaluatedpoint file filltype frame grid3 guide horner hsv hyperbola indexedTransform int inversion key light line linefit marginT marker mass object pair parabola patch path path3 pen picture point position positionedvector projection real revolution scaleT scientific segment side slice solution splitface string surface tensionSpecifier ticklocate ticksgridT tickvalues transform transformation tree triangle trilinear triple vector vertex void )) (defvar asy-function-name '( -AND Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPRCcylinder drawPRCdisk drawPRCsphere drawPRCtube drawPhoton drawScalar drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endScript endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitXasyMode exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 photon piecewisestraight point polar polarconicroutine polargraph polygon postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zero3 zlimits zpart ztick ztick3 ztrans )) +AND Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _strokepath _texpath aCos aSin aTan abort abs accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPRCcylinder drawPRCdisk drawPRCsphere drawPRCtube drawPhoton drawScalar drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endScript endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitXasyMode exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface incenter incentral incircle increasing incrementposition indexedTransform indexedfigure initXasyMode initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural needshipout newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa none norm normalout normalvideo nosetpagesize notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocentercenter outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 photon piecewisestraight point polar polarconicroutine polargraph polygon postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys startScript stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans )) (defvar asy-variable-name '( -AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity4 ignore inXasyMode inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings shipped signedtrailingzero solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom undefined unitcircle unitsquare up urlpen urlskip version vertexpen vertexsize viewportmargin viewportsize vline white wye xformStack yellow ylabelwidth zerotickfuzz zerowinding )) +AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diagnostics differentlengths dot dotfactor dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity4 ignore inXasyMode inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings shipped signedtrailingzero solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom undefined unitcircle unitsquare up urlpen urlskip version vertexpen vertexsize viewportmargin viewportsize vline white wye xformStack yellow ylabelwidth zerotickfuzz zerowinding )) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/asymptote.py new/texmf-dist/asymptote/asymptote.py --- old/texmf-dist/asymptote/asymptote.py 2009-06-08 03:04:41.000000000 +0200 +++ new/texmf-dist/asymptote/asymptote.py 2017-04-16 19:27:26.000000000 +0200 @@ -3,7 +3,7 @@ from subprocess import * class asy: def __init__(self): - self.session = Popen(['asy','-quiet','-interactive'],stdin=PIPE) + self.session = Popen(['asy','-quiet','-inpipe=0','-outpipe=2'],stdin=PIPE) self.help() def send(self, cmd): self.session.stdin.write(cmd+'\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/geometry.asy new/texmf-dist/asymptote/geometry.asy --- old/texmf-dist/asymptote/geometry.asy 2015-05-13 01:15:42.000000000 +0200 +++ new/texmf-dist/asymptote/geometry.asy 2017-04-16 19:27:26.000000000 +0200 @@ -1295,7 +1295,7 @@ {/*<asyxml></code><documentation>Draw a perpendicular symbol at z aligned in the direction align relative to the path z--z + dir. dir(45 + n * 90), where n in N*, are common values for 'align'.</documentation></function></asyxml>*/ - p = squarecap + p; + p = squarecap + miterjoin + p; if(size == 0) size = perpfactor * 3mm + sqrt(1 + linewidth(p)) - 1; frame apic; pair d1 = size * align * unit(dir) * dir(-45); @@ -1354,8 +1354,6 @@ pair dir = Ap - Op; real a1 = degrees(dir); pair align = rotate(-a1) * unit(dir(Op--Ap, Op--Bp)); - if (margin == NoMargin) - margin = TrueMargin(linewidth(currentpen)/2, linewidth(currentpen)/2); perpendicularmark(pic = pic, z = O, align = align, dir = dir, size = size, p = p, margin = margin, filltype = filltype); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/graph.asy new/texmf-dist/asymptote/graph.asy --- old/texmf-dist/asymptote/graph.asy 2013-05-19 00:47:34.000000000 +0200 +++ new/texmf-dist/asymptote/graph.asy 2017-04-16 19:27:26.000000000 +0200 @@ -657,6 +657,7 @@ } if(calcStep) { + if(N == 1) N=2; if(N == 0) N=(int) (len/Step); else Step=len/N; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/graph3.asy new/texmf-dist/asymptote/graph3.asy --- old/texmf-dist/asymptote/graph3.asy 2013-04-08 20:41:28.000000000 +0200 +++ new/texmf-dist/asymptote/graph3.asy 2017-04-16 19:27:26.000000000 +0200 @@ -4,8 +4,6 @@ import graph; import three; -triple zero3(real) {return O;} - typedef triple direction3(real); direction3 Dir(triple dir) {return new triple(real) {return dir;};} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/ode.asy new/texmf-dist/asymptote/ode.asy --- old/texmf-dist/asymptote/ode.asy 2015-05-13 01:15:42.000000000 +0200 +++ new/texmf-dist/asymptote/ode.asy 2017-04-16 19:27:26.000000000 +0200 @@ -98,8 +98,7 @@ } // First-Order Euler -RKTableau Euler=RKTableau(1,new real[][], - new real[] {1}); +RKTableau Euler=RKTableau(1,new real[][], new real[] {1}); // First-Order Exponential Euler RKTableau E_Euler=RKTableau(1,new real[][], new real[] {1}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/palette.asy new/texmf-dist/asymptote/palette.asy --- old/texmf-dist/asymptote/palette.asy 2015-05-13 01:15:42.000000000 +0200 +++ new/texmf-dist/asymptote/palette.asy 2017-04-16 19:27:26.000000000 +0200 @@ -245,12 +245,12 @@ real Min=min(f); real Max=max(f); int n=f.length; - int m=n > 0 ? f[0].length : 0; - pen[][] p=new pen[n][m]; + pen[][] p=new pen[n][]; real step=(Max == Min) ? 0.0 : (palette.length-1)/(Max-Min); for(int i=0; i < n; ++i) { real[] fi=f[i]; - p[i]=sequence(new pen(int j) {return palette[round((fi[j]-Min)*step)];},m); + p[i]=sequence(new pen(int j) {return palette[round((fi[j]-Min)*step)];}, + f[i].length); } return p; } @@ -270,6 +270,7 @@ } paletteticks PaletteTicks=PaletteTicks(); +paletteticks NoTicks=new ticks(int sign=-1) {return NoTicks;}; void palette(picture pic=currentpicture, Label L="", bounds bounds, pair initial, pair final, axis axis=Right, pen[] palette, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/plain.asy new/texmf-dist/asymptote/plain.asy --- old/texmf-dist/asymptote/plain.asy 2014-04-29 00:14:00.000000000 +0200 +++ new/texmf-dist/asymptote/plain.asy 2017-04-16 19:27:26.000000000 +0200 @@ -280,3 +280,23 @@ } cputime(); + +void nosetpagesize() +{ + static bool initialized=false; + if(!initialized && latex()) { + // Portably pass nosetpagesize option to graphicx package. + texpreamble("\usepackage{ifluatex}\ifluatex +\ifx\pdfpagewidth\undefined\let\pdfpagewidth\paperwidth\fi +\ifx\pdfpageheight\undefined\let\pdfpageheight\paperheight\fi\else +\let\paperwidthsave\paperwidth\let\paperwidth\undefined +\usepackage{graphicx} +\let\paperwidth\paperwidthsave\fi"); + initialized=true; + } +} + +nosetpagesize(); + +if(settings.tex == "luatex") + texpreamble("\input luatex85.sty"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/plain_pens.asy new/texmf-dist/asymptote/plain_pens.asy --- old/texmf-dist/asymptote/plain_pens.asy 2011-05-28 18:52:13.000000000 +0200 +++ new/texmf-dist/asymptote/plain_pens.asy 2017-04-16 19:27:26.000000000 +0200 @@ -99,7 +99,7 @@ pen deepblue=rgb(0,0,0.5); pen deepcyan=rgb(0,0.5,0.5); pen deepmagenta=rgb(0.5,0,0.5); -pen olive=rgb(0.5,0.5,0); +pen deepyellow=rgb(0.5,0.5,0); pen deepgray=gray(0.1); pen darkred=rgb(0.25,0,0); @@ -123,6 +123,7 @@ pen salmon=lightred; pen brown=deepred; +pen olive=deepyellow; pen darkbrown=darkred; pen pink=palemagenta; pen palegrey=palegray; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/plain_picture.asy new/texmf-dist/asymptote/plain_picture.asy --- old/texmf-dist/asymptote/plain_picture.asy 2013-05-19 00:47:34.000000000 +0200 +++ new/texmf-dist/asymptote/plain_picture.asy 2017-04-16 19:27:26.000000000 +0200 @@ -1236,6 +1236,15 @@ pic.addPath(g); } +void drawstrokepath(picture pic=currentpicture, path g, pen strokepen, + pen p=currentpen) +{ + pic.add(new void(frame f, transform t) { + draw(f,strokepath(t*g,strokepen),p); + },true); + pic.addPath(g,p); +} + void latticeshade(picture pic=currentpicture, path[] g, bool stroke=false, pen fillrule=currentpen, pen[][] p, bool copy=true) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/smoothcontour3.asy new/texmf-dist/asymptote/smoothcontour3.asy --- old/texmf-dist/asymptote/smoothcontour3.asy 2016-04-07 18:52:56.000000000 +0200 +++ new/texmf-dist/asymptote/smoothcontour3.asy 2017-04-16 19:27:26.000000000 +0200 @@ -1574,7 +1574,8 @@ for (int i = 0; i < patches.length; ++i) { triple center = (patches[i].triangular ? patches[i].point(1/3, 1/3) : patches[i].point(1/2,1/2)); - patches[i] = shift(center) * scale3(1.01) * shift(-center) * patches[i]; + transform3 T=shift(center) * scale3(1.03) * shift(-center); + patches[i] = T * patches[i]; } } return surface(...patches); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/solids.asy new/texmf-dist/asymptote/solids.asy --- old/texmf-dist/asymptote/solids.asy 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/asymptote/solids.asy 2017-04-16 19:27:26.000000000 +0200 @@ -408,5 +408,5 @@ // Note: unitsphere provides a smoother and more efficient surface. revolution sphere(triple c=O, real r, int n=nslice) { - return revolution(c,Arc(c,r,180,0,0,0,Y,n),Z); + return revolution(c,Arc(c,r,180-sqrtEpsilon,0,sqrtEpsilon,0,Y,n),Z); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/three.asy new/texmf-dist/asymptote/three.asy --- old/texmf-dist/asymptote/three.asy 2014-05-17 20:38:56.000000000 +0200 +++ new/texmf-dist/asymptote/three.asy 2017-04-16 19:27:26.000000000 +0200 @@ -79,7 +79,7 @@ defaultrender.tessellate=false; defaultrender.merge=false; defaultrender.margin=0.02; -defaultrender.tubegranularity=0.005; +defaultrender.tubegranularity=0.001; defaultrender.sphere=NURBSsphere; defaultrender.labelfill=true; defaultrender.partnames=false; @@ -218,7 +218,7 @@ } // Return the transformation corresponding to moving the camera from the target -// (looking in the negative z direction) to the point 'eye' (looking at target), +// (looking in the negative z direction) to the point 'eye' (looking at target, // orienting the camera so that direction 'up' points upwards. // Since, in actuality, we are transforming the points instead of the camera, // we calculate the inverse matrix. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/three_surface.asy new/texmf-dist/asymptote/three_surface.asy --- old/texmf-dist/asymptote/three_surface.asy 2016-04-07 18:52:56.000000000 +0200 +++ new/texmf-dist/asymptote/three_surface.asy 2017-04-16 19:27:26.000000000 +0200 @@ -1273,13 +1273,15 @@ return patch(subpatch(s.P,a,b),s.straight,s.planar); } -// return an array containing an intersection times of path p and surface s. +// return an array containing the times for one intersection of path p and +// patch s. real[] intersect(path3 p, patch s, real fuzz=-1) { return intersect(p,s.P,fuzz); } -// return an array containing an intersection times of path p and surface s. +// return an array containing the times for one intersection of path p and +// surface s. real[] intersect(path3 p, surface s, real fuzz=-1) { for(int i=0; i < s.s.length; ++i) { @@ -1402,14 +1404,9 @@ if(prc()) PRCshininess=PRCshininess(m.shininess); - if(s.triangular) - drawbeziertriangle(f,s.P,center,s.straight && s.planar,m.p, - m.opacity,m.shininess,PRCshininess,s.colors, - interaction.type); - else - draw(f,s.P,center,s.straight && s.planar,m.p,m.opacity,m.shininess, - PRCshininess,s.planar ? s.normal(0.5,0.5) : O,s.colors, - interaction.type,prc); + (s.triangular ? drawbeziertriangle : draw) + (f,s.P,center,s.straight && s.planar,m.p,m.opacity,m.shininess, + PRCshininess,s.colors,interaction.type,prc); } // Draw triangles on a frame. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/asymptote/version.asy new/texmf-dist/asymptote/version.asy --- old/texmf-dist/asymptote/version.asy 2016-05-13 01:01:15.000000000 +0200 +++ new/texmf-dist/asymptote/version.asy 2017-04-16 19:27:26.000000000 +0200 @@ -1 +1 @@ -string VERSION="2.38"; +string VERSION="2.41"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/asymptote/asymptote.sty new/texmf-dist/tex/latex/asymptote/asymptote.sty --- old/texmf-dist/tex/latex/asymptote/asymptote.sty 2016-04-07 18:52:56.000000000 +0200 +++ new/texmf-dist/tex/latex/asymptote/asymptote.sty 2017-04-16 19:27:26.000000000 +0200 @@ -9,7 +9,7 @@ %% The ASYMPTOTE package %% %% (C) 2003 Tom Prince -%% (C) 2003-2015 John Bowman +%% (C) 2003-2016 John Bowman %% (C) 2010 Will Robertson %% %% Adapted from comment.sty @@ -17,7 +17,7 @@ %% Licence: GPL2+ %% \ProvidesPackage{asymptote} - [2016/02/09 v1.30 Asymptote style file for LaTeX] + [2016/11/26 v1.33 Asymptote style file for LaTeX] \def\Asymptote{{\tt Asymptote}} \InputIfFileExists{\jobname.pre}{}{} \newbox\ASYbox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asymptote.tlpobj new/tlpkg/tlpobj/asymptote.tlpobj --- old/tlpkg/tlpobj/asymptote.tlpobj 2016-05-13 03:15:39.000000000 +0200 +++ new/tlpkg/tlpobj/asymptote.tlpobj 2017-04-17 16:22:31.000000000 +0200 @@ -1,10 +1,10 @@ name asymptote category TLCore -revision 41076 +revision 43843 shortdesc 2D and 3D TeX-Aware Vector Graphics Language longdesc Asymptote is a powerful descriptive vector graphics language longdesc for technical drawing, inspired by MetaPost but with an -longdesc improved C++-like syntax. Asymptote provides for figures of the +longdesc improved C++-like syntax. Asymptote provides for figures the longdesc same high-quality level of typesetting that LaTeX does for longdesc scientific text. depend asymptote.ARCH @@ -115,7 +115,7 @@ texmf-dist/tex/latex/asymptote/latexmkrc texmf-dist/tex/latex/asymptote/ocg.sty catalogue-ctan /graphics/asymptote -catalogue-date 2016-05-12 15:02:52 +0200 +catalogue-date 2017-03-23 07:57:03 +0100 catalogue-license lgpl3 catalogue-topics graphics-engn -catalogue-version 2.38 +catalogue-version 2.41 ++++++ asypictureb.doc.tar.xz ++++++ ++++++ asypictureb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asypictureb.tlpobj new/tlpkg/tlpobj/asypictureb.tlpobj --- old/tlpkg/tlpobj/asypictureb.tlpobj 2016-04-14 18:37:56.000000000 +0200 +++ new/tlpkg/tlpobj/asypictureb.tlpobj 2017-04-14 17:29:21.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=3 RELOC/tex/latex/asypictureb/asypictureB.sty catalogue-ctan /graphics/asypictureb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-incl catalogue-version 0.3 ++++++ attachfile.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/attachfile/README new/doc/latex/attachfile/README --- old/doc/latex/attachfile/README 2015-10-03 00:14:20.000000000 +0200 +++ new/doc/latex/attachfile/README 2016-11-25 19:28:06.000000000 +0100 @@ -21,7 +21,7 @@ Copyright and license --------------------- -Copyright (C) 2015 Scott Pakin <scott+af(a)pakin.org> +Copyright (C) 2016 Scott Pakin <scott+af(a)pakin.org> This package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this Binary files old/doc/latex/attachfile/attachfile.pdf and new/doc/latex/attachfile/attachfile.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/attachfile.doc.tlpobj new/tlpkg/tlpobj/attachfile.doc.tlpobj --- old/tlpkg/tlpobj/attachfile.doc.tlpobj 2016-04-14 18:37:56.000000000 +0200 +++ new/tlpkg/tlpobj/attachfile.doc.tlpobj 2017-04-14 17:29:21.000000000 +0200 @@ -1,8 +1,8 @@ name attachfile.doc category Package -revision 38830 +revision 42099 shortdesc doc files of attachfile relocated 1 -docfiles size=89 +docfiles size=90 RELOC/doc/latex/attachfile/README RELOC/doc/latex/attachfile/attachfile.pdf ++++++ attachfile.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/attachfile/attachfile.bib new/bibtex/bib/attachfile/attachfile.bib --- old/bibtex/bib/attachfile/attachfile.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/bibtex/bib/attachfile/attachfile.bib 2016-11-25 19:27:05.000000000 +0100 @@ -0,0 +1,31 @@ +@Book{PDFRef, + author = {{Adobe Systems Incorporated}}, + title = {{PDF} Reference Version~1.6}, + publisher = {Adobe Press}, + year = 2004, + key = {PDF}, + edition = {Fifth}, + month = dec # {~3,}, + note = {ISBN~\mbox{0321304748}. Available from \url{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}} +} + +@Unpublished{MediaTypes, + author = {{Internet Assigned Numbers Authority}}, + title = {{MIME} Media Types}, + note = {Available from \url{http://www.iana.org/assignments/media-types/}}, + key = {IANA} +} + +@TechReport{Freed1996, + author = {N. Freed and N. Borenstein}, + title = {{M}ultipurpose {I}nternet {M}ail {E}xtensions {(MIME)} + Part Two: Media Types}, + institution = {Internet Engineering Task Force (IETF), + Network Working Group}, + year = 1996, + type = {Request for Comments (RFC)}, + number = 2046, + month = nov, + note = {Available from + \url{http://www.rfc-editor.org/rfc/rfc2046.txt}} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/attachfile/attachfile.sty new/tex/latex/attachfile/attachfile.sty --- old/tex/latex/attachfile/attachfile.sty 2015-11-12 23:17:27.000000000 +0100 +++ new/tex/latex/attachfile/attachfile.sty 2016-11-25 19:33:41.000000000 +0100 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2015 Scott Pakin <scott+af(a)pakin.org> +%% Copyright (C) 2016 Scott Pakin <scott+af(a)pakin.org> %% ------------------------------------------------------- %% %% This package may be distributed and/or modified under the @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{attachfile} - [2015/11/11 v1.8 PDF 1.3+ file attachment] + [2016/09/18 v1.9 PDF 1.3+ file attachment] \RequirePackage{ifpdf} \ifpdf \else @@ -145,9 +145,7 @@ \settowidth{\atfi@appearancewidth}{\usebox{\atfi@appearancebox}}% \settoheight{\atfi@appearanceheight}{\usebox{\atfi@appearancebox}}% \settodepth{\atfi@appearancedepth}{\usebox{\atfi@appearancebox}}% - \immediate\pdfxform attr { - /Subtype /Form - } \atfi@appearancebox + \immediate\pdfxform \atfi@appearancebox \edef\atfi@appearanceobj{\the\pdflastxform}% } \DeclareRobustCommand{\atfi@flags@to@int}{% @@ -169,7 +167,11 @@ \def\noexpand\atfi@file{\atfi@file}% }\next \filename@parse{\atfi@file}% - \edef\atfi@file{\filename@base.\filename@ext}% + \@ifundefined{filename@ext}{% + \edef\atfi@file{\filename@base}% + }{% + \edef\atfi@file{\filename@base.\filename@ext}% + }% \ifatfi@appearance \def\atfi@appearance@dict{% /AP << @@ -207,6 +209,12 @@ \def\atfi@attachfile#1#2{% \setkeys{AtFi}{#1}% \atfi@embedfile{#2}% + \@ifundefined{atfi@acro\atfi@icon@icon}{% + \PackageError{attachfile}{Icon not found}{% + attachfile defines only the following icons:\MessageBreak + Graph, Paperclip, PushPin, Tag + }% + }{}% \atfi@set@appearance{\csname atfi@acro\atfi@icon@icon\endcsname}% \atfi@flags@to@int% \atfi@insert@file@annot{#2}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/attachfile.tlpobj new/tlpkg/tlpobj/attachfile.tlpobj --- old/tlpkg/tlpobj/attachfile.tlpobj 2016-04-14 18:37:56.000000000 +0200 +++ new/tlpkg/tlpobj/attachfile.tlpobj 2017-04-14 17:29:22.000000000 +0200 @@ -1,6 +1,6 @@ name attachfile category Package -revision 38830 +revision 42099 shortdesc Attach arbitrary files to a PDF document relocated 1 longdesc Starting with PDF 1.3 (Adobe Acrobat 4.0), PDF files can @@ -15,11 +15,12 @@ longdesc customize their appearance in the enclosing document. The longdesc package supports the Created, Modified, and Size keys in the longdesc EmbeddedFile's Params dictionary. -runfiles size=4 +runfiles size=5 + RELOC/bibtex/bib/attachfile/attachfile.bib RELOC/tex/latex/attachfile/attachfile.sty catalogue-also attachfile2 catalogue-ctan /macros/latex/contrib/attachfile -catalogue-date 2015-11-12 05:44:34 +0100 +catalogue-date 2016-09-19 09:50:11 +0200 catalogue-license lppl1.3 catalogue-topics pdf-feat -catalogue-version 1.8 +catalogue-version 1.9 ++++++ augie.doc.tar.xz ++++++ ++++++ augie.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/augie.tlpobj new/tlpkg/tlpobj/augie.tlpobj --- old/tlpkg/tlpobj/augie.tlpobj 2016-04-14 18:37:57.000000000 +0200 +++ new/tlpkg/tlpobj/augie.tlpobj 2017-04-14 17:29:22.000000000 +0200 @@ -23,6 +23,6 @@ RELOC/tex/latex/augie/ts1augie.fd catalogue-also twcal catalogue-ctan /fonts/augie -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-calligraphic font-type1 ++++++ auncial-new.doc.tar.xz ++++++ ++++++ auncial-new.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auncial-new.tlpobj new/tlpkg/tlpobj/auncial-new.tlpobj --- old/tlpkg/tlpobj/auncial-new.tlpobj 2016-04-14 18:37:57.000000000 +0200 +++ new/tlpkg/tlpobj/auncial-new.tlpobj 2017-04-14 17:29:22.000000000 +0200 @@ -26,7 +26,7 @@ RELOC/tex/latex/auncial-new/auncial.sty RELOC/tex/latex/auncial-new/b1auncl.fd catalogue-ctan /fonts/auncial-new -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-bookhand font-type1 catalogue-version 2.0 ++++++ aurical.doc.tar.xz ++++++ ++++++ aurical.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aurical.tlpobj new/tlpkg/tlpobj/aurical.tlpobj --- old/tlpkg/tlpobj/aurical.tlpobj 2016-04-14 18:37:58.000000000 +0200 +++ new/tlpkg/tlpobj/aurical.tlpobj 2017-04-14 17:29:22.000000000 +0200 @@ -92,7 +92,7 @@ RELOC/tex/latex/aurical/T1LukasSvatba.fd RELOC/tex/latex/aurical/aurical.sty catalogue-ctan /fonts/aurical -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-calligraphic font-type1 catalogue-version 1.5 ++++++ authoraftertitle.doc.tar.xz ++++++ ++++++ authoraftertitle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authoraftertitle.tlpobj new/tlpkg/tlpobj/authoraftertitle.tlpobj --- old/tlpkg/tlpobj/authoraftertitle.tlpobj 2016-04-14 18:38:00.000000000 +0200 +++ new/tlpkg/tlpobj/authoraftertitle.tlpobj 2017-04-14 17:29:23.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/authoraftertitle/authoraftertitle.sty catalogue-also titling catalogue-ctan /macros/latex/contrib/authoraftertitle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics macro-supp catalogue-version 0.9 ++++++ authorindex.doc.tar.xz ++++++ ++++++ authorindex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authorindex.tlpobj new/tlpkg/tlpobj/authorindex.tlpobj --- old/tlpkg/tlpobj/authorindex.tlpobj 2016-04-14 18:38:00.000000000 +0200 +++ new/tlpkg/tlpobj/authorindex.tlpobj 2017-04-14 17:29:23.000000000 +0200 @@ -14,6 +14,6 @@ texmf-dist/scripts/authorindex/authorindex texmf-dist/tex/latex/authorindex/authorindex.sty catalogue-ctan /indexing/authorindex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics index cite-supp ++++++ auto-pst-pdf.doc.tar.xz ++++++ ++++++ auto-pst-pdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auto-pst-pdf.tlpobj new/tlpkg/tlpobj/auto-pst-pdf.tlpobj --- old/tlpkg/tlpobj/auto-pst-pdf.tlpobj 2016-04-14 18:38:01.000000000 +0200 +++ new/tlpkg/tlpobj/auto-pst-pdf.tlpobj 2017-04-14 17:29:24.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/auto-pst-pdf/auto-pst-pdf.sty catalogue-ctan /macros/latex/contrib/auto-pst-pdf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-epspdf catalogue-version 0.6 ++++++ autoarea.doc.tar.xz ++++++ ++++++ autoarea.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/autoarea.tlpobj new/tlpkg/tlpobj/autoarea.tlpobj --- old/tlpkg/tlpobj/autoarea.tlpobj 2016-04-14 18:38:01.000000000 +0200 +++ new/tlpkg/tlpobj/autoarea.tlpobj 2017-04-14 17:29:24.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/autoarea/autoarea.sty catalogue-also pictex catalogue-ctan /graphics/pictex/addon/autoarea -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex catalogue-version 0.3a ++++++ automata.doc.tar.xz ++++++ ++++++ automata.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/automata.tlpobj new/tlpkg/tlpobj/automata.tlpobj --- old/tlpkg/tlpobj/automata.tlpobj 2016-04-14 18:38:01.000000000 +0200 +++ new/tlpkg/tlpobj/automata.tlpobj 2017-04-14 17:29:24.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=7 RELOC/metapost/automata/automata.mp catalogue-ctan /graphics/metapost/contrib/macros/automata -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics automata catalogue-version 0.3 ++++++ autonum.doc.tar.xz ++++++ ++++++ autonum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/autonum.tlpobj new/tlpkg/tlpobj/autonum.tlpobj --- old/tlpkg/tlpobj/autonum.tlpobj 2016-04-14 18:38:01.000000000 +0200 +++ new/tlpkg/tlpobj/autonum.tlpobj 2017-04-14 17:29:24.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/autonum/autonum.sty catalogue-ctan /macros/latex/contrib/autonum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths label-ref catalogue-version 0.3.11 ++++++ autopdf.doc.tar.xz ++++++ ++++++ autopdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/autopdf.tlpobj new/tlpkg/tlpobj/autopdf.tlpobj --- old/tlpkg/tlpobj/autopdf.tlpobj 2016-04-14 18:38:02.000000000 +0200 +++ new/tlpkg/tlpobj/autopdf.tlpobj 2017-04-14 17:29:24.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/autopdf/autopdf.sty catalogue-also epstopdf auto-pst-pdf catalogue-ctan /macros/latex/contrib/autopdf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics graphics-epspdf callback catalogue-version 1.1 ++++++ autosp.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/autosp/README new/texmf-dist/doc/generic/autosp/README --- old/texmf-dist/doc/generic/autosp/README 2016-04-07 19:00:31.000000000 +0200 +++ new/texmf-dist/doc/generic/autosp/README 2017-04-17 00:27:13.000000000 +0200 @@ -1,5 +1,5 @@ This is the README for the autosp package, -version 2016-01-30. +version 2017-04-06. autosp is a preprocessor that generates note-spacing commands for MusiXTeX scores. It simplifies the creation @@ -37,12 +37,15 @@ coded using the standard \def\atnextbar notation but also by using the non-standard command \Cpause in a note segment. -Spacing commands \sk and \hsk (but not \qsk, \hqsk or -\qqsk) in the source are discarded. A note segment can be -completely empty, but if a note segment should start with or -contain a "space," the note-value of that space must be made -explicit with a command of the form \ha{*}, \qa{.*}, \qa{*}, -\ca{*}, etc. +Spacing commands \sk and \hsk in the source are discarded, +but not \qsk, \hqsk or \qqsk; moreover non-standard commands +\Qsk, \HQsk and \QQsk generate "global" skips; i.e., the +effect of \qsk, \hqsk or \qqsk in *every* staff. + +A note segment can be completely empty, but if a note +segment should start with or contain a "space," the +note-value of that space must be made explicit with a +command of the form \ha{*}, \qa{.*}, \qa{*}, \ca{*}, etc. All other conventional MusiXTeX commands are output exactly as given in the input. Binary files old/texmf-dist/doc/generic/autosp/autosp.pdf and new/texmf-dist/doc/generic/autosp/autosp.pdf differ Binary files old/texmf-dist/doc/generic/autosp/barsant2.pdf and new/texmf-dist/doc/generic/autosp/barsant2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/autosp/geminiani.aspc new/texmf-dist/doc/generic/autosp/geminiani.aspc --- old/texmf-dist/doc/generic/autosp/geminiani.aspc 2016-04-07 19:00:31.000000000 +0200 +++ new/texmf-dist/doc/generic/autosp/geminiani.aspc 2017-04-17 00:27:13.000000000 +0200 @@ -23,7 +23,7 @@ \setname4{Alto Recorder} \setname5{Soprano Recorder} \advance\parindent by 18ex -\fulltitle{\BIgfont\so{Concerto Grosso}} +\fulltitle{\sc\so{Concerto Grosso}} \subtitle{\frtrm Opus~3, Number~4} \author{Francesco Geminiani \sc(1687--1762)} \othermention{Arranged for SATTB Recorders} @@ -55,8 +55,8 @@ \anotes\qup D\qs\cca E&\qa{fh}&\qa k\qs\ibbl2k{-3}\qb2{kj}\tql2i&\qlp m\qs\cca n&\qa{hd}\en \anotes\qup F\qs\cca G&\qa{dh}&\qa{hd}&\qa o\qs\ibbl3o{-3}\qb3{on}\tql3m&\qlp k\qs\cca k\en \bar%3 -\anotes\qa{HH}&\ha a&\qlp h\qs\cca h&\qlp l\qs\cca l\qqsk&\qlp k\qs\cca j\en -\anotes\qa{DK}&\ha d&\ha h&\tr{o}\ha{^m}&\qa j\ibl4i{-3}\qb4{.i}\tbbl4\tql4h\en +\anotes\qa{HH}&\ha a&\qlp h\qs\cca h&\qlp l\qs\cca l&\qlp k\qs\cca j\en +\anotes\qa{DK}&\ha d&\ha h&\QQsk\tr{o}\ha{^m}&\qa j\ibl4i{-3}\qb4{.i}\tbbl4\tql4h\en \bar%4 \anotes\qa{GG}&\ha d&\qlp g\qs\cca g&\qa{nk}&\qlp i\qs\cca i\en \anotes\qa{CJ}&\ha c&\ha g&\tinynotesize\qu m\tr{n}\ha l&\tr{k}\qlp i\qs\cca h\en @@ -87,7 +87,7 @@ \bar%12 \anotes\ha D&\Cpause&\ibu2d3\qb2{.d}\tbbu2\qb2e\qb2{.f}\tbbu2\tqu2g&\ha k&\ha f\en \anotes\ibl0K{-3}\qb0{.K}\tbbl0\qb0J\qb0{.I}\tbbl0\tql0H&&\qa{hd}&\qlp h\qs\cca h&\qlp{^f}\qs\cca f\en -\setendvolta% +\endvoltabox% \alaligne%13 \advance\barno-1% \leftrepeat% @@ -147,7 +147,7 @@ \alaligne%28 \znotes&&&&\zchar{18}{\bf\kern-4ex Allegro assai}\en \anotes\qa D\ds&\ca f\ibu1d{0}\qb1{.d}\tbbu1\tqu1d&\ca a\qa d&\ca k\itieu3k\qa k&\ca d\ds\ds\en -\setendvolta% +\setendvoltabox% \leftrepeat%29 \znotes&&&&\segno k\en \anotes\Cpause&\ibbu1f0\qb1{edefg}\tqu1e&\itied2a\qa{.a}&\ttie3\ca k\trt m\qa{^j}&\Cpause\en @@ -190,7 +190,7 @@ \bar%43 \anotes\ibu0E{0}\qb0{EE}\tqu0D&\Cpause&\ttie2\ibu2c0\qb2{d^c}\tqu2d&\ibl3g0\qb3{.g}\nbbl3\qb3{gh}\tql3i&\ibbl4f0\qb4{gfgef}\tql4g\en \bar%44 -\anotes\ibbu0E3\qb0{^CDCH^I}\tqu0{^J}&\itieu1h\qa{.h}&\tr l\qa{.e}&\ibl3e0\qb3{he}\tql3g&\ibbl4h{-2}\qb4{hihgf}\tql4e\en +\anotes\ibbu0E3\qb0{^CDCH}\QQsk\qb0{^I}\QQsk\tqu0{^J}&\itieu1h\qa{.h}&\tr l\qa{.e}&\ibl3e0\qb3{he}\tql3g&\ibbl4h{-2}\qb4{hihgf}\tql4e\en \bar%45 \anotes\ibl0K{-1}\qb0{KM}\cna J\tql0J&\ttie1\ibl1d0\qb1{hd}\tql1h&\ca d\itieu2h\qa h&\ibl3f2\qb3f\qb3{.h}\tbbl3\tql3h&\ibu4f0\qb4{ff}\tqu4e\en \bar%46 @@ -202,7 +202,7 @@ \bar%49 \anotes\ibl0H0\qb0H\qb0{.H}\tbbl0\tql0H&\qa{.e}&\ca h\qa h&\ibbl3k0\qb3{lklmn}\tql3l&\ttie4\ca d\tr k\qa{^c}\en \bar%50 -\anotes\ibbl0L0\qb0{K^JKLM}\tql0K&\qa{.d}&\qa h\itied2d\ca d&\ibbl3m{-2}\qb3{mlkji}\tql3h&\ca d\ibl4f0\qb4{.f}\tbbl4\tql4f\en +\anotes\ibbl0L0\qb0{K}\QQsk\qb0{^JKLM}\tql0K&\qa{.d}&\qa h\itied2d\ca d&\ibbl3m{-2}\qb3{mlkji}\tql3h&\ca d\ibl4f0\qb4{.f}\tbbl4\tql4f\en \bar%51 \anotes\ibbl0M0\qb0{LKLMN}\tql0L&\qa{.g}&\ttie2\ca d\qa j&\ca g\ibl3n0\qb3{.n}\tbbl3\tql3n&\ibbu4g{-2}\qb4{gfedc}\tqu4b\en \bar%52 @@ -224,7 +224,7 @@ \bar%60 \anotes\ca K\qa N&\ca d\qa g&\ca d\qa g&\ibbl3i0\qb3{^ihijk}\tql3i&\ds\ibu4d0\qb4{.d}\tbbu4\tqu4d\en \bar%61 -\anotes\qa{.J}&\qa{.c}&\qa{.c}&\ibbl3j0\qb3{j}\smallsh i\qb3{ijkj}\smallna i\tql3{i}&\ibbu4f0\qb4{edefg}\tqu4e\en +\anotes\qa{.J}&\qa{.c}&\qa{.c}&\ibbl3j0\qb3{j}\smallsh i\qb3{ijkj}\QQsk\tql3{=i}&\ibbu4f0\qb4{edefg}\tqu4e\en \bar%62 \anotes\qa{.K}&\qa{.d}&\qa{.d}&\ibbl3h0\qb3{hghij}\tql3h&\ibbu4f0\qb4{^fefgh}\tqu4f\en \bar%63 @@ -240,7 +240,7 @@ \bar%68 \anotes\qa{.E}&\ibbl1h0\qb1{^ihijk}\tql1i&\ca e\qa e&\ttie3\ca h\qa{^g}&\ibbu4c0\qb4{^babcd}\tqu4b\en \bar%69 -\anotes\ibu0H0\qb0{H.H}\tbbu0\tqu0H&\qa{.j}&\ibu2c5\qb2{ae}\tqu2h&\ca h\itieu3o\qa o&\ibbu4d0\qb4{c^bcde}\tqu4c\en +\anotes\ibu0H0\qb0{H.H}\tbbu0\tqu0H&\qa{.j}&\ibu2c5\qb2{ae}\tqu2h&\ca h\itieu3o\qa o&\ibbu4d0\qb4{c}\QQsk\qb4{^bcde}\tqu4c\en \bar%70 \anotes\ibbl0H0\qb0{^IHIJK}\tql0I&\qa{.^i}&\qa d\ca{^i}&\ttie3\ca o\qa{^n}&\ibbu4e0\qb4{dcdef}\tqu4d\en \bar%71 @@ -248,41 +248,43 @@ \bar%72 \anotes\ibl0E2\qb0{Da}\tql0H&\ibbu1f0\qb1{defde}\tqu1f&\ibl2f0\qb2{.f}\nbbl2\qb2{fg}\tql2h&\ca m\itieu3m\qa m&\ttie4\ibl4e0\qb4j\qb4d\tql4j\en \bar%73 -\anotes\ibbu0G0\qb0{GHGFE}\tqu0D&\ca g\qa N&\ibbu2d0\qb2{dcd^bc}\tqu2d&\ttie3\ibl3i0\qb3{mg}\tql3m&\ca{^i}\itieu4i\qa i\en +\anotes\ibbu0G0\qb0{GHGFE}\tqu0D&\ca g\qa N&\ibbu2d0\qb2{dcd}\QQsk\qb2{^bc}\tqu2d&\ttie3\ibl3i0\qb3{mg}\tql3m&\ca{^i}\itieu4i\qa i\en \bar%74 \anotes\ibl0D2\qb0{CN}\tql0G&\ibbu1e0\qb1{cdecd}\tqu1e&\ibbu2f0\qb2{efgef}\tqu2g&\ca l\itieu3l\qa l&\ttie4\ibl4e0\qb4i\qb4c\tql4{^i}\en \bar%75 -\anotes\ibbu0F{0}\qb0{FGFED}\tqu0C&\ibbl1f2\qb1f\tql1g\qa h&\ibbu2c0\qb2{c^bcab}\tqu2c&\ttie3\ibl3h0\qb3l\qb3f\tql3l&\ca h\itieu4h\qa h\en +\anotes\ibbu0F{0}\qb0{FGFED}\tqu0C&\ibbl1f2\qb1f\tql1g\qa h&\ibbu2c0\qb2{c}\QQsk\qb2{^bcab}\tqu2c&\ttie3\ibl3h0\qb3l\qb3f\tql3l&\ca h\itieu4h\qa h\en \bar%76 \anotes\ca D\qa M&\ibbu1c0\qb1{^bcdbc}\tqu1d&\ibu2d2\qb2{.d}\nbbu2\qb2{de}\tqu2f&\ca k\itieu3k\qa k&\ttie4\ibu4h0\qb4{h^b}\tqu4h\en \bar%77 \anotes\ibbl0L{-2}\qb0{LMLKJ}\tql0{^I}&\itied1e\qa{.e}&\qa{^b}\ca e&\ttie3\ibl3g0\qb3{ke}\tql3k&\tr k\qa{.^g}\en \bar%78 -\anotes\ibbl0H0\qb0{H^GH^IJ}\tql0H&\ttie1\qa e\ca c&\qa{.h}&\ibbl3i{-2}\qb3{j^ijih}\tql3g&\ibu4g{-2}\qb4h\qb4a\itied4e\tqu4e\en +\anotes\ibbl0H0\qb0{H^GH}\QQsk\qb0{^IJ}\tql0H&\ttie1\qa e\ca c&\qa{.h}&\ibbl3i{-2}\qb3{j}\QQsk\qb3{^ijih}\tql3g&\ibu4g{-2}\qb4h\qb4a\itied4e\tqu4e\en \bar%79 -\anotes\ibbl0K0\qb0{KJKLM}\tql0K&\ca d\qa f&\qa{.h}&\ibbl3f0\qb3{femlk}\tql3j&\ttie4\ca e\ibbl4k{-2}\qb4{kj^i}\tql4h\en +\anotes\ibbl0K0\qb0{KJKLM}\tql0K&\ca d\qa f&\qa{.h}&\ibbl3f0\qb3{femlk}\tql3j&\ttie4\ca e\ibbl4k{-2}\qb4{kj}\QQsk\qb4{^i}\tql4h\en \bar%80 -\anotes\ibl0G{0}\qb0L\qb0E\tql0K&\itied1e\qa{.e}&\ds\ibbu2d{-2}\qb2{edc}\tqu2{^b}&\ibbl3i2\qb3{^il^n}\tql3l\ds&\ibbu4g{0}\qb4{^g}\qb4{^f}\qb4{e^be}\tqu4{^g}\en +\nspace +\anotes\ibl0G{0}\qb0L\qb0E\tql0K&\itied1e\qa{.e}&\ds\ibbu2d{-2}\qb2{edc}\QQsk\tqu2{^b}&\ibbl3i2\qb3{^il}\QQsk\qb3{^n}\tql3l\ds&\ibbu4g{0}\qb4{^g}\QQsk\qb4{^f}\QQsk\qb4{e^be}\QQsk\tqu4{^g}\en \bar%81 -\anotes\qa J\ca J&\ttie1\ca e\itieu1h\qa h&\ibbu2g0\qb2{cehgf}\tqu2e&\ds\ibl3h0\qb3{.h}\tbbl3\tql3h&\ibbu4h{-3}\qb4{h=gfed}\tqu4c\en +\anotes\qa J\ca J&\ttie1\ca e\itieu1h\qa h&\ibbu2g0\qb2{cehgf}\tqu2e&\ds\ibl3h0\qb3{.h}\tbbl3\tql3h&\ibbu4h{-3}\qb4{h}\QQsk\qb4{=gfed}\tqu4c\en \bar%82 \anotes\ca{^I}\qa{L}&\ttie1\ca h\tr k\qa{^g}&\ibbu2f0\qb2d\tbbu2\qb2f\qb2e\itied2e\tqu2e&\ibbl3h0\qb3{^ihijk}\tql3i&\ca d\tr k\qa{^b}\en \bar%83 -\anotes\ca H\itieu0H\qa H&\qa h\ds&\ttie2\ibbu2e{-1}\qb2{edc^bc}\tqu2a&\ibbl3j0\qb3{j^ijkl}\tql3j&\qa a\ds\en +\anotes\ca H\itieu0H\qa H&\qa h\ds&\ttie2\ibbu2e{-1}\qb2{edc}\HQsk\qb2{^bc}\tqu2a&\ibbl3j0\qb3{j}\HQsk\qb3{^ijkl}\tql3j&\qa a\ds\en \bar%84 -\anotes\ttie0\ibu0H{0}\qb0H\nbbu0\qb0{GFG}\tqu0E&\Cpause&\ca{^b}\tr k\qa{^c}&\ca k\qa l&\Cpause\en +\nspace +\anotes\ttie0\ibu0H{0}\qb0H\nbbu0\qb0{GFG}\tqu0E&\Cpause&\ca{^b}\HQsk\tr k\qa{^c}&\ca k\qa l&\Cpause\en \bar%85 \anotes\qa{.F}&\ibl1f0\qb1h\nbbl1\qb1{hgf}\tql1h&\ibbl2d1\qb2{dhfgh}\tql2f&\ca h\itieu3k\qa k&\ds\ibu4d0\qb4{.d}\tbbu4\tqu4d\en \bar%86 \anotes\qa{.E}&\ibl1e0\qb1{ge}\tql1h&\ibbl2f0\qb2{gfgfe}\tql2g&\ttie3\ca k\tr l\qa{^j}&\ibbu4e0\qb4{edefg}\tqu4e\en \bar%87 -\anotes\ca D\itieu0K\qa K&\ibl1f{-2}\qb1{fh}\itieu1d\tql1d&\ca h\itied2d\qa d&\ibbl3k0\qb3{k^jklm}\tql3k&\ibbl4f0\qb4{fefgh}\tql4f\en +\anotes\ca D\itieu0K\qa K&\ibl1f{-2}\qb1{fh}\itieu1d\tql1d&\ca h\itied2d\qa d&\ibbl3k0\qb3{k}\QQsk\qb3{^jklm}\tql3k&\ibbl4f0\qb4{fefgh}\tql4f\en \bar%88 \anotes\ttie0\ibl0J{-2}\qb0K\nbbl0\qb0{JIJ}\tql0H&\ttie1\ca d\qa c&\ttie2\ca d\qa c&\ca l\trt p\qa{^m}&\ca g\qa h\en \bar%89 \anotes\qa{.I}&\qa{.b}&\qa{b}\ca d&\ca n\itieu3k\qa k&\qa d\ds\en \bar%90 -\anotes\qa{.H}&\ca a\qa{h}&\ca e\tr k\qa{^f}&\ttie3\ibl3j{-2}\qb3k\nbbl3\qb3{jij}\tql3h&\Cpause\en +\anotes\qa{.H}&\ca a\qa{h}&\ca e\QQsk\tr k\qa{^f}&\ttie3\ibl3j{-2}\qb3k\nbbl3\qb3{jij}\tql3h&\Cpause\en \bar%91 \anotes\qa{.G}&\qa{.d}&\qa{.g}&\ibbl3h0\qb3{ihihg}\tql3i&\ds\itieu4g\qa g\en \bar%92 @@ -304,25 +306,25 @@ \bar%100 \anotes\ibbu0H0\qb0{HIHGF}\tqu0E&\ttie1\ibu1f0\qb1{eh}\tqu1a&\ttie2\ibu2g0\qb2{ga}\tqu2e&\ibl3e0\qb3{he}\tql3g&\tr k\qa{.^c}\en \bar%101 -\anotes\ibu0I0\qb0{DK}\tqu0D&\ibbu1e0\qb1{d^cdef}\tqu1d&\qs\ibbl2f0\qb2{hfgh}\tql2f&\ibbl3f0\qb3{fefhk}\tql3j&\ca d\itieu4h\qa h\en +\anotes\ibu0I0\qb0{DK}\tqu0D&\ibbu1e0\qb1{d}\QQsk\qb1{^cdef}\tqu1d&\qs\ibbl2f0\qb2{hfgh}\tql2f&\ibbl3f0\qb3{fefhk}\tql3j&\ca d\itieu4h\qa h\en \bar%102 \anotes\ibbu0H0\qb0{GFGHI}\tqu0G&\qs\ibbl1j{-3}\qb1{kihg}\tql1f&\ca d\qa i&\ibbl3i0\qb3{ihikl}\tql3k&\ttie4\ca h\itieu4g\qa g\en \bar%103 -\anotes\ibu0J0\qb0{HK}\tqu0D&\ibbu1e{-1}\qb1e\tbbu1\qb1{^c}\tqu1d\ca h&\qa{.h}&\ibbl3j0\qb3{^jlkjk}\tql3l&\ttie4\ibbl4e0\qb4{gefef}\tql4g\en +\anotes\ibu0J0\qb0{HK}\tqu0D&\ibbu1e{-1}\qb1e\tbbu1\QQsk\qb1{^c}\tqu1d\ca h&\qa{.h}&\ibbl3j0\qb3{^jlkjk}\tql3l&\ttie4\ibbl4e0\qb4{gefef}\tql4g\en \bar%104 \anotes\ibu0J0\qb0{HK}\tqu0D&\ibu1f{3}\qb1a\tqu1{h}\ds&\ibl2f{-3}\qb2h\tql2d\ds&\ibbl3j0\qb3{^jlkjk}\tql3l&\ibbl4e0\qb4{egfef}\tql4g\en \bar%105 \anotes\ca H\ds\ds&\qs\ibbu1g0\qb1{heh^c}\tqu1e&\qs\ibbu2g0\qb2{heh^c}\tqu2e&\ca{^j}\ds\ds&\ca e\ds\ds\en \bar%106 -\anotes\itieu0H\qa{.H}&\qs\ibbu1c0\qb1{a^c^bd}\tqu1c&\qs\ibbu2c0\qb2{a^c^bd}\tqu2c&\Cpause&\Cpause\en +\anotes\itieu0H\qa{.H}&\qs\ibbu1c0\qb1{a}\QQsk\qb1{^c}\QQsk\qb1{^bd}\tqu1c&\qs\ibbu2c0\qb2{a^c^bd}\tqu2c&\Cpause&\Cpause\en \bar%107 \anotes\ttie0\itieu0H\qa{.H}&\ibbu1f0\qb1{edfeg}\tqu1f&\ibbu2f0\qb2{edfeg}\tqu2f&\Cpause&\Cpause\en \bar%108 -\anotes\ttie0\itieu0H\qa{.H}&\itied1a\qa{.a}&\itied2a\qa{.a}&\ibbl3i0\qb3{hg^ih^j}\tql3i&\Cpause\en +\anotes\ttie0\itieu0H\qa{.H}&\itied1a\qa{.a}&\itied2a\qa{.a}&\ibbl3i0\qb3{hg}\QQsk\qb3{^ih}\QQsk\qb3{^j}\tql3i&\Cpause\en \bar%109 -\anotes\ttie0\itieu0H\qa{.H}&\ttie1\itied1a\qa{.a}&\ttie2\itied2a\qa{.a}&\ibbl3l0\qb3{k^jlkm}\tql3l&\Cpause\en +\anotes\ttie0\itieu0H\qa{.H}&\ttie1\itied1a\qa{.a}&\ttie2\itied2a\qa{.a}&\ibbl3l0\qb3{k}\QQsk\qb3{^jlkm}\tql3l&\Cpause\en \bar%110 -\anotes\ttie0\qa{.H}&\ttie1\qa{.a}&\ttie2\qa{.a}&\ibbl3m0\qb3{nlmno}\tql3{^p}&\Cpause\en +\anotes\ttie0\qa{.H}&\ttie1\qa{.a}&\ttie2\qa{.a}&\ibbl3m0\qb3{nlmno}\QQsk\tql3{^p}&\Cpause\en \bar%111 \anotes\ibbu0H0\qb0{HIHGF}\tqu0E&\ibbu1f0\qb1{aehef}\tqu1g&\ca h\ds\ds&\ca l\ds\ds&\ca{^j}\ds\ds\en \bar%112 @@ -349,18 +351,21 @@ \znotes&&&&\uptext{\bf\kern4ex Adagio}\en \anotes\fermataup N\qa G\qp\hp&\fermataup l\qa i\qp\hp&\fermataup l\qa d\qp\hp&\fermataup n\qa n\qp\qa{.k}\qs\cca k&\fermataup l\qa g\qp\hp\en \bar%121 +\nspace \anotes\wh{^L}&\wh{^g}&\wh{^i}& \qa{.^p}\uptuplet{s}{3.3}{-6}\ibbl3o{-2}\qb3{o}\qsk\qb3{^n}\qsk\tql3{^m}& \wh{^e}\en \addspace\afterruleskip% \anotes\ha{*}&\ha{*}&\ha{*}&\ibl3l{-2}\smallsh l\qb3{.l}\tbbl3\qb3k\tr n\qb3{.j}\tbbl3\tql3{^i}&\ha{*}\en \bar%122 +\nspace \anotes\wh H&\wh c&\ibl2i2\qb2{.^i}\tbbl2\tql2j\tr p\qa h&\ibl3h3\qb3{.h}\tbbl3\qb3o\qb3{.^l}\tbbl3\tql3o&\ha{^e}\en \anotes\ha{*}&\ha{*}&\ibl2i{0}\qb2{.j}\tbbl2\qb2{^l}\qb2{.h}\tbbl2\tql2j&\qa{jh}&\usf n\qa{.h}\qs\cca h\en \bar%123 +\nspace \anotes\wh{^J}&\ibl1h0\qb1{.h}\tbbl1\qb1{^l}\qb1{.l}\tbbl1\tql1h&\ha{^e}&\wh h& - \qa{.^l}\uptuplet{o}{3.3}{-6}\ibbl4k{-2}\qb4{k}\qsk\qb4{^j}\qsk\tql4{^i}\hqsk\en -\anotes\ha{*}&\qa{^eg}&\ha{^l}&\ha{*}&\ibu4h{-2}\qb4{.h}\tbbu4\qb4g\tr o\qb4{.f}\tbbu4\tqu4{^e}\en + \qa{.^l}\uptuplet{o}{3.3}{-6}\ibbl4k{-2}\qb4{k}\qsk\qb4{^j}\qsk\tql4{^i}\en +\anotes\ha{*}&\HQsk\qa{^eg}&\ha{^l}&\ha{*}&\ibu4h{-2}\qb4{.h}\tbbu4\qb4g\tr o\qb4{.f}\tbbu4\tqu4{^e}\en \alaligne%124 \anotes\wh K&\qa{fm}&\wh h&\ibl3k3\qb3{.k}\tbbl3\qb3r\qb3{.o}\tbbl3\tql3r&\ibu4e2\qb4{.^e}\tbbu4\tqu4f\tr n\qa d\en \anotes\ha{*}&\qa{kh}&\ha{*}&\ibl3l{0}\qb3{.m}\tbbl3\qb3o\qb3{.k}\tbbl3\tql3m&\usf l\qa{.k}\qs\cca k\en @@ -371,10 +376,10 @@ \anotes\ha N&\qa k\ibl1k0\qb1{.k}\tbbl1\tql1k&\ibl2h0\qb2{.k}\tbbl2\qb2g\qb2{.i}\tbbl2\tql2k&\qa{on}&\tinynotesize\qu h\qa{.i}\qs\cca i\en \anotes\ha{^L}&\ibl1n{-2}\qb1{.n}\tbbl1\qb1m\qb1{.^l}\tbbl1\tql1k&\ibl2j0\qb2{.j}\tbbl2\tql2j\qa j&\ha n&\isluru4i\qa i\tslur4j\qa j\en \bar%127 -\anotes\ha M&\ha j&\dsp\ibu2f3\roff{\tbbu2}\qb2f\qb2{.h}\tbbu2\tqu2j&\qa{nm}&\qa{.h}\qs\cca h\en +\anotes\ha M&\ha j&\dsp\ibu2g3\roff{\tbbu2}\qb2f\qb2{.h}\tbbu2\tqu2j&\qa{nm}&\qa{.h}\qs\cca h\en \anotes\ha K&\ibl1m{-2}\qb1{.m}\tbbl1\cna l\qb1l\qb1{.k}\tbbl1\tql1j&\ibl2i0\qb2{.i}\tbbl2\tql2i\qa i&\ha m&\qa{hi}\en \bar%128 -\anotes\ha{LJ}&\qa{ige}\ibu1h4\qb1{.g}\tbbu1\tqu1j&\dsp\ibu2e3\roff{\tbbu2}\qb2e\qb2{.g}\tbbu2\tqu2i\qa h\itieu2j\qa j&\qa{ml}\ha l&\tinynotesize\qu h\qa{.g}\qs\cca g\qa j\ibl4k2\qb4{.k}\tbbl4\tql4l\en +\anotes\ha{LJ}&\qa{ige}\ibu1h4\qb1{.g}\tbbu1\tqu1j&\dsp\ibu2f3\roff{\tbbu2}\qb2e\qb2{.g}\tbbu2\tqu2i\qa h\itieu2j\qa j&\qa{ml}\ha l&\tinynotesize\qu h\qa{.g}\qs\cca g\qa j\ibl4k2\qb4{.k}\tbbl4\tql4l\en \bar%129 \anotes\ha{.K}\qp&\ha{.h}\qa i&\ttie2\ibu2j{-5}\qb2{.j}\tbbu2\tqu2d\ha j\qa i&\qa{.k}\qs\cca k\qa k\tr n\qa{^l}&\tinynotesize\qu g\smallsh f\qa{.f}\qs\cca f\qa f\tr o\qa g\en \bar%130 @@ -393,6 +398,7 @@ \bar%133 \anotes\wh L&\qa{gg}\ha j&\ha{ln}&\ttie3\ha r\tr s\ha q&\ha{gn}\en \bar%134 +\nspace \anotes\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en \generalmeter{\meterfrac68}% \Changecontext% @@ -411,6 +417,7 @@ \bar%138 \anotes\qa{.J.I}&\Cpause&\Cpause&\qa{.l.k}&\ibu4h2\qb4{hi}\tqu4j\tinynotesize\cu i\qa h\ca g\en \bar%139 +\nspace \anotes\qa{.H.G}&\Cpause&\Cpause&\qa{.j}\ibl3i2\qb3{ij}\tql3k&\tr o\qa{.^f}\qa{.g}\en \bar%140 \anotes\itieu0K\ha{.K}&\Cpause&\qa{.^f.g}&\itieu3k\ha{.k}&\ibl4h2\qb4{hk}\tql4j\ibu4i{-2}\qb4{ih}\tqu4g\en @@ -466,8 +473,10 @@ \bar%162 \anotes\Cpause&\Cpause&\Cpause&\qa{.^l}\tr n\qa{.k}&\ibu4e2\qb4{^e^f}\tqu4g\qa g\ca g\en \bar%163 +\nspace \anotes\qa{.^L.K}&\qa{.g.i}&\qa{.g.i}&\qa{.^j.k}&\itied4g\qa{.g}\ttie4\ibu4h0\qb4{gh}\tqu4g\en \bar%164 +\nspace \anotes\qa{.^J.H}&\qa{.h}\ibu1g{-2}\qb1{gf}\tqu1{^e}&\qa{.h}\ibu2g{-2}\qb2{gf}\tqu2{^e}&\qa{.^l}\tr n\qa{.^j}&\ibl4g0\qb4{^l^f}\tql4g\ibu4i{-2}\qb4{ih}\tqu4g\en \bar%165 \addspace\afterruleskip% @@ -494,6 +503,7 @@ \bar%173 \anotes\qa{.K}\qpp&\qa{.h}\qpp&\qa{.k}\qpp&\qa{.k}\qpp&\ibu4d2\qb4{d^e}\tqu4{^f}\qa f\ca f\en \bar%174 +\nspace \anotes\qa{.K}\qpp&\qa{.k}\ibl1i0\qb1{ji}\tql1j&\qa{.d}\qpp&\ibl3k2\qb3{k^l}\tql3{^m}\qa m\ca m&\ibu4f2\qb4{^fg}\tqu4h\qa h\ca h\en \bar%175 \anotes\qa{.K.K}&\ibu1h{-2}\qb1{hg}\tqu1{^f}\ibu1f2\qb1{fg}\tqu1h&\itieu2k\ha{.k}&\ibl3m2\qb3{^mn}\tql3o\ibl3o{-2}\qb3{on}\tql3m&\ibl4h2\qb4{hi}\tql4j\ibl4j{-2}\qb4{ji}\tql4h\en @@ -520,6 +530,7 @@ \bar%186 \anotes\qa{.L.J}&\Cpause&\Cpause&\ttie3\qa{.n}\qa{.n}&\tinynotesize\qu i\qa{.h}\qa j\ca i\en \bar%187 +\nspace \anotes\qa{.K.K}&\ds\ibu1f2\qb1{^f}\tqu1g\ibu1h2\qb1{hi}\tqu1j&\qa{.d}\itieu2k\qa{.k}&\ca{^m}\ibl3k2\qb3k\tql3{^l}\ibl3m2\qb3{mn}\tql3o&\ca h\ibu4d2\qb4d\tqu4{^e}\ibu4f2\qb4{^fg}\tqu4h\en \bar%188 \anotes\qa{.N.J}&\ibu1i{-2}\qb1{ih}\tqu1g\qa l\ca l&\ttie2\ibl2k{-2}\qb2{kj}\tql2i\qa j\ca j&\ibl3n2\qb3{no}\tql3p\ibl3m0\qb3n\cna m\qb3m\tql3n&\ibl4i2\qb4{ij}\tql4k\qa l\ca l\en @@ -552,6 +563,7 @@ \bar%202 \anotes\qpp\cna L\qa{.L}&\qpp\qa{.g}&\qpp\itieu2j\qa{.j}&\qa{.j}\qa{.n}&\qpp\qa{.g}\en \bar%203 +\nspace \anotes\ha{.K}&\qa{.h}\itied1h\qa{.h}&\ttie2\qa{.j}\qa{.h}&\ibl3m1\qb3{^mo}\tql3n\ibl3m{-2}\qb3{m^l}\tql3k&\qa{.d}\qpp\en \bar%204 \anotes\ha{.^M}&\ttie1\ibu1i0\qb1{hj}\tqu1i\ibu1h2\qb1{hi}\tqu1j&\itieu2k\ha{.k}&\qa{.k}\itieu3o\qa{.o}&\ibl4j1\qb4{jl}\tql4k\ibl4j{-2}\qb4{ji}\tql4h\en @@ -571,7 +583,8 @@ \Setvolta{2}% \bar%210 \anotes\qa{.G}\qpp&\qa{.g}\qpp&\qa{.k}\qpp&\qa{.n}\qpp&\qa{.g}\qpp\en -\mulooseness-2% +\setendvoltabox% +\mulooseness-1% \Endpiece \eject \end Binary files old/texmf-dist/doc/generic/autosp/geminiani.pdf and new/texmf-dist/doc/generic/autosp/geminiani.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/autosp/kinder2.aspc new/texmf-dist/doc/generic/autosp/kinder2.aspc --- old/texmf-dist/doc/generic/autosp/kinder2.aspc 2016-04-07 19:00:31.000000000 +0200 +++ new/texmf-dist/doc/generic/autosp/kinder2.aspc 2017-04-17 00:27:13.000000000 +0200 @@ -20,7 +20,7 @@ \setname3{Treble Recorder} \setname4{Descant Recorder} \advance\parindent by 18ex -\fulltitle{\BIgfont\so{Von fremden Ländern und Menschen}} +\fulltitle{\Bigtype\so{Von fremden Ländern und Menschen}} \subtitle{\medtype From {\it Kinderszenen} (Scenes from Childhood), Opus~15, Number~1} \othermention{Arranged for Recorders by R. D. Tennent} \author{Robert Schumann \sc(1810--1856)} @@ -87,7 +87,7 @@ \anotes\qa J&\qa c&\triolet d\ds\ibu1h5\qb1{g}\tqu1j&\isluru1m\qa e\en \anotes\qa J&\qa d&\triolet e\ds\ibu1i5\qb1{h}\tqu1k&\qa f\en \bar%14 -\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H\fermataup N\qa G&\fermataup l\ha d&\triolet m\ds\ibl1g5\qb1{g}\tql1k\triolet m\ds\ibl1h{5}\qb1{h}\fermataup l\tql1k&\ibu2g1\qb2{.g}\tbbu2\tqu2h\ibl2i1\trfslur1p\fermataup l\qb2{.i}\roff{\tbbl2\tql2j}\ccca{*}\en +\anotes\ibu0I{-2}\qb0{.I}\tbbu0\tqu0H\hqsk\fermataup N\qa G&\fermataup l\ha d&\triolet m\ds\ibl1g5\qb1{g}\tql1k\hqsk\triolet m\ds\ibl1h{5}\qb1{h}\fermataup l\tql1k&\ibu2g1\qb2{.g}\tbbu2\tqu2h\hqsk\ibl2i1\trfslur1p\fermataup l\qb2{.i}\roff{\tbbl2\tql2j}\ccca{*}\en \bar%15 \znotes\zcn{e}{\ppff \kern-5ex mezzo staccato}&&&\Uptext{\kern-2ex\ppff a tempo}\en \anotes\qa N&\qa i&\triolet n\ds\ibl1k5\qb1{k}\tql1n&\isluru1k\qa i\en Binary files old/texmf-dist/doc/generic/autosp/kinder2.pdf and new/texmf-dist/doc/generic/autosp/kinder2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/autosp/quod2.aspc new/texmf-dist/doc/generic/autosp/quod2.aspc --- old/texmf-dist/doc/generic/autosp/quod2.aspc 2016-04-07 19:00:31.000000000 +0200 +++ new/texmf-dist/doc/generic/autosp/quod2.aspc 2017-04-17 00:27:13.000000000 +0200 @@ -28,7 +28,7 @@ \setname3{A} \setname4{S} \songtop4\songbottom1 -\fulltitle{\BIgfont \so{Quodlibet}} +\fulltitle{\sc\so{Quodlibet}} \subtitle{\it Variation 30 of the Goldberg Variations for Clavier} \title{\it Quodlibet} \author{J. S. Bach (1685--1750)} @@ -81,17 +81,17 @@ \anotes \itieu0a\qa a\ttie0\ibbl0a{-2}\qb0{aNM}\tqb0L& \ibl1l{-2}\qb1l\tqb1k\cl{^j}\ds& - \qa{.o}\ibbl2i2\qb2i\qsk\tqb2{^j}& + \qa{.o}\ibbl2i2\qb2i\Qsk\tqb2{^j}& \shake{n}\ibl3i0\qb3{^j}\nbbl3\qb3i\tqb3j\cu h\ds\en \bar%7 \anotes\qa{MK}&\ibu1g0\qb1{fgh}\tqh1f&\ibl2k0\qb2{klm}\tqb2k&\qa{hh}\en \anotes\qa{NG}&\ibu1g{-2}\qb1{gfe}\tqh1d&\ibl2i4\qb2{ikn}\tqb2m&\qa{ii}\en \bar%8 -\vnotes0.4\elemskip&&&\en +\nspace \anotes \qu{.H}\cu{^J}& \ibu1c4\qb1{^cde}\itied1h\tqh1h& - \ibl2l{-1}\qb2{.l}\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\hqsk\tbbl2\qb2{^j}\itieu2l\tqb2l& + \ibl2l{-1}\qb2{.l}\itieu2k\tbbl2\tqb2k\ttie2\ibbl2j0\qb2k\HQsk\tbbl2\qb2{^j}\itieu2l\tqb2l& \ibu3h{0}\qb3{hih}\tqh3g\en \anotes \ql K\cl K& @@ -117,14 +117,14 @@ \qa{.a}\cl{^a}& \ibl1m{-1}\qb1{mnm}\tqb1l& \qa{qq}& - \ibbl3k2\qb3{^klm}\tqb3n\ibl3o{-2}\qb3o\nbbl3\qb3n\qsk\tqb3m\en + \ibbl3k2\qb3{^klm}\tqb3n\ibl3o{-2}\qb3o\nbbl3\qb3n\tqb3m\en \bar%12 -\vnotes0.4\elemskip&&&\en +\nspace \anotes \qa b\qa I& \ibl1k2\qb1{^k}\nbbl1\qb1l\tqb1m\itied1i\qu i& \ibl2o{-1}\qb2p\qb2q\qb2p\tqb2o& - \ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\qsk\ibbl3k0\qb3{^kl}\qb3m\tqb3k\en + \ibl3n{-2}\qb3n\nbbl3\qb3m\tqb3l\Qsk\ibbl3k0\qb3{^kl}\qb3m\tqb3k\en \anotes \qa{.L}\cl{=K}& \ttie1\ibu1i0\qb1i\nbbu1\qb1h\tqh1i\ibu1g2\qb1g\nbbu1\qb1h\tqh1i& Binary files old/texmf-dist/doc/generic/autosp/quod2.pdf and new/texmf-dist/doc/generic/autosp/quod2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/autosp.1 new/texmf-dist/doc/man/man1/autosp.1 --- old/texmf-dist/doc/man/man1/autosp.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/autosp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,5 +1,5 @@ .\" This manpage is licensed under the GNU Public License -.TH AUTOSP 1 2016-01-30 "" "" +.TH AUTOSP 1 2017-04-06 "" "" .SH NAME autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores @@ -126,9 +126,14 @@ the non-standard command \\Cpause in a note segment generates a bar-centered rest. -Spacing commands \\sk and \\hsk -(but not \\qsk, \\hqsk or \\qqsk) -in the source are discarded. +Spacing commands \\sk and \\hsk in the source are discarded, +but not \\qsk, \\hqsk or \\qqsk; +moreover +non-standard commands +\\Qsk, \\HQsk and \\QQsk generate "global" skips; i.e., the effect of \\qsk, \\hqsk or \\qqsk in +.I every +staff. + A note segment can be completely empty, but if a note segment should start with or contain a "space," the note-value of that space must be made explicit with a command of the @@ -199,7 +204,7 @@ (\fIx\fP\-1)/\fIx\fP of the apparent x-tuplet duration. So, for example, a triplet in eighths is assumed to be played in the time of one quarter note. -If these assumptions +If this assumption isn't valid, the x-tuplet must be coded explicitly using a \\vnotes command; see the first measure of barsant2.aspc for an example of a non-standard x-tuplet: a 5-tuple @@ -207,7 +212,11 @@ of .I six 64ths. - +.B autosp +cannot deal with simultaneous x-tuplets in multiple staffs unless the x values and +note durations are identical. Global skips (\\QQsk, \\HQsk and \\Qsk) are +ineffective if a staff has an x-tuplet; however, "local" skips (\\qqsk, \\hqsk, \\qsk) +are effective. User-defined macros are not processed or expanded. @@ -215,8 +224,9 @@ an example of how to work around this. .B autosp -will not be effective for music with more than one voice in a single staff. It might be -advisable to use a separate staff for each voice, or to omit certain voices +may not be effective for music with more than one voice in a single staff. It might be +advisable to use a separate staff for each voice, to avoid \\anotes when necessary, +or to omit certain voices initially and add them into the resulting TeX file. .SH EXAMPLES Binary files old/texmf-dist/doc/man/man1/autosp.man1.pdf and new/texmf-dist/doc/man/man1/autosp.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/autosp.doc.tlpobj new/tlpkg/tlpobj/autosp.doc.tlpobj --- old/tlpkg/tlpobj/autosp.doc.tlpobj 2016-04-27 03:14:36.000000000 +0200 +++ new/tlpkg/tlpobj/autosp.doc.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,8 +1,8 @@ name autosp.doc category Package -revision 40768 +revision 44166 shortdesc doc files of autosp -docfiles size=88 +docfiles size=85 texmf-dist/doc/generic/autosp/README texmf-dist/doc/generic/autosp/autosp.pdf texmf-dist/doc/generic/autosp/barsant2.aspc ++++++ avantgar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/avantgar.tlpobj new/tlpkg/tlpobj/avantgar.tlpobj --- old/tlpkg/tlpobj/avantgar.tlpobj 2016-04-14 18:38:03.000000000 +0200 +++ new/tlpkg/tlpobj/avantgar.tlpobj 2017-04-14 17:29:25.000000000 +0200 @@ -180,6 +180,6 @@ RELOC/tex/latex/avantgar/ts1uag.fd catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -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-type1 font-collection ++++++ avremu.doc.tar.xz ++++++ ++++++ avremu.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/avremu.tlpobj new/tlpkg/tlpobj/avremu.tlpobj --- old/tlpkg/tlpobj/avremu.tlpobj 2016-04-14 18:38:04.000000000 +0200 +++ new/tlpkg/tlpobj/avremu.tlpobj 2017-04-14 17:29:26.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/avremu/avr.testsuite.tex RELOC/tex/latex/avremu/avremu.sty catalogue-ctan /macros/latex/contrib/avremu -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics emulation catalogue-version 0.1 ++++++ b1encoding.doc.tar.xz ++++++ ++++++ b1encoding.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/b1encoding.tlpobj new/tlpkg/tlpobj/b1encoding.tlpobj --- old/tlpkg/tlpobj/b1encoding.tlpobj 2016-04-14 18:38:05.000000000 +0200 +++ new/tlpkg/tlpobj/b1encoding.tlpobj 2017-04-14 17:29:26.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/b1encoding/b1cmr.fd RELOC/tex/latex/b1encoding/b1enc.def catalogue-ctan /macros/latex/contrib/b1encoding -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics fontenc catalogue-version 1.0 ++++++ babel-albanian.doc.tar.xz ++++++ ++++++ babel-albanian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-albanian.tlpobj new/tlpkg/tlpobj/babel-albanian.tlpobj --- old/tlpkg/tlpobj/babel-albanian.tlpobj 2016-04-14 18:38:06.000000000 +0200 +++ new/tlpkg/tlpobj/babel-albanian.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/generic/babel-albanian/albanian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/albanian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics albanian catalogue-version 1.0c ++++++ babel-basque.doc.tar.xz ++++++ ++++++ babel-basque.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-basque.tlpobj new/tlpkg/tlpobj/babel-basque.tlpobj --- old/tlpkg/tlpobj/babel-basque.tlpobj 2016-04-14 18:38:06.000000000 +0200 +++ new/tlpkg/tlpobj/babel-basque.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=2 RELOC/tex/generic/babel-basque/basque.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/basque -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics basque multilingual-addon catalogue-version 1.0f ++++++ babel-belarusian.doc.tar.xz ++++++ ++++++ babel-belarusian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-belarusian.tlpobj new/tlpkg/tlpobj/babel-belarusian.tlpobj --- old/tlpkg/tlpobj/babel-belarusian.tlpobj 2016-04-21 03:14:23.000000000 +0200 +++ new/tlpkg/tlpobj/babel-belarusian.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=6 RELOC/tex/generic/babel-belarusian/belarusianb.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/belarusian -catalogue-date 2016-04-20 10:44:25 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon belarusian catalogue-version 1.3h ++++++ babel-bosnian.doc.tar.xz ++++++ ++++++ babel-bosnian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-bosnian.tlpobj new/tlpkg/tlpobj/babel-bosnian.tlpobj --- old/tlpkg/tlpobj/babel-bosnian.tlpobj 2016-04-14 18:38:07.000000000 +0200 +++ new/tlpkg/tlpobj/babel-bosnian.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/generic/babel-bosnian/bosnian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/bosnian -catalogue-date 2015-08-21 00:26:56 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bosnian multilingual-addon catalogue-version 1.1 ++++++ babel-breton.doc.tar.xz ++++++ ++++++ babel-breton.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-breton.tlpobj new/tlpkg/tlpobj/babel-breton.tlpobj --- old/tlpkg/tlpobj/babel-breton.tlpobj 2016-04-14 18:38:07.000000000 +0200 +++ new/tlpkg/tlpobj/babel-breton.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/generic/babel-breton/breton.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/breton -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics breton multilingual-addon catalogue-version 1.0h ++++++ babel-bulgarian.doc.tar.xz ++++++ ++++++ babel-bulgarian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-bulgarian.tlpobj new/tlpkg/tlpobj/babel-bulgarian.tlpobj --- old/tlpkg/tlpobj/babel-bulgarian.tlpobj 2016-04-14 18:38:07.000000000 +0200 +++ new/tlpkg/tlpobj/babel-bulgarian.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=6 RELOC/tex/generic/babel-bulgarian/bulgarian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/bulgarian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bulgarian multilingual-addon catalogue-version 1.2g ++++++ babel-catalan.doc.tar.xz ++++++ ++++++ babel-catalan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-catalan.tlpobj new/tlpkg/tlpobj/babel-catalan.tlpobj --- old/tlpkg/tlpobj/babel-catalan.tlpobj 2016-04-14 18:38:07.000000000 +0200 +++ new/tlpkg/tlpobj/babel-catalan.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/generic/babel-catalan/catalan.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/catalan -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics catalan multilingual-addon catalogue-version 2.2p ++++++ babel-croatian.doc.tar.xz ++++++ ++++++ babel-croatian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-croatian.tlpobj new/tlpkg/tlpobj/babel-croatian.tlpobj --- old/tlpkg/tlpobj/babel-croatian.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-croatian.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-croatian/croatian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/croatian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics croatian multilingual-addon catalogue-version 1.3l ++++++ babel-czech.doc.tar.xz ++++++ ++++++ babel-czech.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-czech.tlpobj new/tlpkg/tlpobj/babel-czech.tlpobj --- old/tlpkg/tlpobj/babel-czech.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-czech.tlpobj 2017-04-14 17:29:27.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=4 RELOC/tex/generic/babel-czech/czech.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/czech -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics czech catalogue-version 3.1a ++++++ babel-danish.doc.tar.xz ++++++ ++++++ babel-danish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-danish.tlpobj new/tlpkg/tlpobj/babel-danish.tlpobj --- old/tlpkg/tlpobj/babel-danish.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-danish.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/generic/babel-danish/danish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/danish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics danish catalogue-version 1.3r ++++++ babel-dutch.doc.tar.xz ++++++ ++++++ babel-dutch.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-dutch.tlpobj new/tlpkg/tlpobj/babel-dutch.tlpobj --- old/tlpkg/tlpobj/babel-dutch.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-dutch.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/generic/babel-dutch/dutch.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/dutch -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dutch catalogue-version 3.8i ++++++ babel-english.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-english/README new/doc/generic/babel-english/README --- old/doc/generic/babel-english/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/babel-english/README 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,13 @@ +English 3.3r +------------ + +This is the babel style for English. + +There are no new features in 3.3q, but "dialects" will be +loaded with proxy files (american.ldf, british.ldf, etc.). + +Version 3.3r just fixes the names for UKenglish.ldf and +USenglish.ldf (files were created lowercased). + +---------- +2017-06-06 \ No newline at end of file Binary files old/doc/generic/babel-english/english.pdf and new/doc/generic/babel-english/english.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-english.doc.tlpobj new/tlpkg/tlpobj/babel-english.doc.tlpobj --- old/tlpkg/tlpobj/babel-english.doc.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-english.doc.tlpobj 2017-06-07 02:21:34.000000000 +0200 @@ -1,7 +1,8 @@ name babel-english.doc category Package -revision 30264 +revision 44495 shortdesc doc files of babel-english relocated 1 -docfiles size=32 +docfiles size=33 + RELOC/doc/generic/babel-english/README RELOC/doc/generic/babel-english/english.pdf ++++++ babel-english.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/UKenglish.ldf new/tex/generic/babel-english/UKenglish.ldf --- old/tex/generic/babel-english/UKenglish.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/UKenglish.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `UKenglish.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `ukenglish') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{UKenglish} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `UKenglish.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/USenglish.ldf new/tex/generic/babel-english/USenglish.ldf --- old/tex/generic/babel-english/USenglish.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/USenglish.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `USenglish.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `usenglish') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{USenglish} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `USenglish.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/american.ldf new/tex/generic/babel-english/american.ldf --- old/tex/generic/babel-english/american.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/american.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `american.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `american') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{american} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `american.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/australian.ldf new/tex/generic/babel-english/australian.ldf --- old/tex/generic/babel-english/australian.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/australian.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `australian.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `australian') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{australian} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `australian.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/british.ldf new/tex/generic/babel-english/british.ldf --- old/tex/generic/babel-english/british.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/british.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `british.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `british') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{british} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `british.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/canadian.ldf new/tex/generic/babel-english/canadian.ldf --- old/tex/generic/babel-english/canadian.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/canadian.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `canadian.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `canadian') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{canadian} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `canadian.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/english.ldf new/tex/generic/babel-english/english.ldf --- old/tex/generic/babel-english/english.ldf 2013-05-07 00:21:17.000000000 +0200 +++ new/tex/generic/babel-english/english.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -4,10 +4,11 @@ %% %% The original source files were: %% -%% english.dtx (with options: `code') +%% english.dtx (with options: `english,code') %% This is a generated file. %% %% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -23,7 +24,7 @@ %% %% This work has the LPPL maintenance status "maintained". %% -%% The Current Maintainer of this work is Johannes Braams. +%% The Current Maintainer of this work is Javier Bezos. %% %% This file may only be distributed together with a copy of the Babel %% system. You may however distribute the Babel system without @@ -37,13 +38,12 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesLanguage{english} - [2012/08/20 v3.3p English support from the babel system] + [2017/06/06 v3.3r English support from the babel system] %% File 'english.dtx' %% Babel package for LaTeX version 2e %% Copyright (C) 1989 - 2005 %% by Johannes Braams, TeXniek -%% Please report errors to: J.L. Braams -%% babel at braams.cistron.nl +%% 2013-2017 Javier Bezos, Johannes Braams \LdfInit\CurrentOption{date\CurrentOption} \ifx\l@english\@undefined \ifx\l@UKenglish\@undefined @@ -98,7 +98,6 @@ \let\l@USenglish\l@american \fi \fi - \ifx\l@canadian\@undefined \adddialect\l@canadian\l@american \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-english/newzealand.ldf new/tex/generic/babel-english/newzealand.ldf --- old/tex/generic/babel-english/newzealand.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/babel-english/newzealand.ldf 2017-06-06 23:46:58.000000000 +0200 @@ -0,0 +1,67 @@ +%% +%% This is file `newzealand.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% english.dtx (with options: `newzealand') +%% This is a generated file. +%% +%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% 2013-2017 Javier Bezos, Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Javier Bezos. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl for additional +%% information. +%% +%% The list of derived (unpacked) files belonging to the distribution +%% and covered by LPPL is defined by the unpacking scripts (with +%% extension .ins) which are part of the distribution. +\ProvidesLanguage{newzealand} + [2017/06/06 v3.3r English support from the babel system] +%% File 'english.dtx' +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 - 2005 +%% by Johannes Braams, TeXniek +%% 2013-2017 Javier Bezos, Johannes Braams +\input english.ldf\relax +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\endinput +%% +%% End of file `newzealand.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-english.tlpobj new/tlpkg/tlpobj/babel-english.tlpobj --- old/tlpkg/tlpobj/babel-english.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-english.tlpobj 2017-06-07 02:21:34.000000000 +0200 @@ -1,16 +1,23 @@ name babel-english category Package -revision 30264 +revision 44495 shortdesc Babel support for English relocated 1 longdesc The package provides the language definition file for support longdesc of English in babel. Care is taken to select british longdesc hyphenation patterns for British English and Australian text, longdesc and default ('american') patterns for Canadian and USA text. -runfiles size=2 +runfiles size=9 + RELOC/tex/generic/babel-english/UKenglish.ldf + RELOC/tex/generic/babel-english/USenglish.ldf + RELOC/tex/generic/babel-english/american.ldf + RELOC/tex/generic/babel-english/australian.ldf + RELOC/tex/generic/babel-english/british.ldf + RELOC/tex/generic/babel-english/canadian.ldf RELOC/tex/generic/babel-english/english.ldf + RELOC/tex/generic/babel-english/newzealand.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/english -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-24 18:51:15 +0100 catalogue-license lppl1.3 catalogue-topics english multilingual-addon -catalogue-version 3.3p +catalogue-version 3.3q ++++++ babel-esperanto.doc.tar.xz ++++++ ++++++ babel-esperanto.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-esperanto.tlpobj new/tlpkg/tlpobj/babel-esperanto.tlpobj --- old/tlpkg/tlpobj/babel-esperanto.tlpobj 2016-04-14 18:38:08.000000000 +0200 +++ new/tlpkg/tlpobj/babel-esperanto.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/babel-esperanto/esperanto.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/esperanto -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics esperanto catalogue-version 1.4t ++++++ babel-estonian.doc.tar.xz ++++++ ++++++ babel-estonian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-estonian.tlpobj new/tlpkg/tlpobj/babel-estonian.tlpobj --- old/tlpkg/tlpobj/babel-estonian.tlpobj 2016-04-14 18:38:09.000000000 +0200 +++ new/tlpkg/tlpobj/babel-estonian.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/babel-estonian/estonian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/estonian -catalogue-date 2016-01-09 16:44:09 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics estonian catalogue-version 1.1a ++++++ babel-finnish.doc.tar.xz ++++++ ++++++ babel-finnish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-finnish.tlpobj new/tlpkg/tlpobj/babel-finnish.tlpobj --- old/tlpkg/tlpobj/babel-finnish.tlpobj 2016-04-14 18:38:09.000000000 +0200 +++ new/tlpkg/tlpobj/babel-finnish.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -1,6 +1,14 @@ name babel-finnish category Package revision 30267 +shortdesc Babel/Polyglossia support for Finnish relocated 1 +longdesc The package provides a language description file that enables +longdesc support of Finnish either with babel or with polyglossia. runfiles size=2 RELOC/tex/generic/babel-finnish/finnish.ldf +catalogue-ctan /macros/latex/contrib/babel-contrib/finnish +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 +catalogue-topics multilingual-addon +catalogue-version 1.3q ++++++ babel-french.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-french/README new/doc/generic/babel-french/README --- old/doc/generic/babel-french/README 2016-05-18 23:58:47.000000000 +0200 +++ new/doc/generic/babel-french/README 2017-02-01 00:01:04.000000000 +0100 @@ -3,7 +3,7 @@ French language support for the babel multilingual package -Copyright 1996--2016 Daniel Flipo +Copyright 1996--2017 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr Released under the LaTeX Project Public License v1.3 or later Binary files old/doc/generic/babel-french/frenchb.pdf and new/doc/generic/babel-french/frenchb.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-french.doc.tlpobj new/tlpkg/tlpobj/babel-french.doc.tlpobj --- old/tlpkg/tlpobj/babel-french.doc.tlpobj 2016-05-19 17:30:52.000000000 +0200 +++ new/tlpkg/tlpobj/babel-french.doc.tlpobj 2017-05-10 02:06:48.000000000 +0200 @@ -1,8 +1,8 @@ name babel-french.doc category Package -revision 41244 +revision 44270 shortdesc doc files of babel-french relocated 1 -docfiles size=67 +docfiles size=59 RELOC/doc/generic/babel-french/README RELOC/doc/generic/babel-french/frenchb.pdf ++++++ babel-french.tar.xz ++++++ ++++ 1674 lines of diff (skipped) ++++++ babel-friulan.doc.tar.xz ++++++ ++++++ babel-friulan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-friulan.tlpobj new/tlpkg/tlpobj/babel-friulan.tlpobj --- old/tlpkg/tlpobj/babel-friulan.tlpobj 2016-04-14 18:38:10.000000000 +0200 +++ new/tlpkg/tlpobj/babel-friulan.tlpobj 2017-04-14 17:29:28.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/generic/babel-friulan/friulan.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/friulan -catalogue-date 2016-03-02 05:17:44 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon catalogue-version 1.3 ++++++ babel-galician.doc.tar.xz ++++++ ++++++ babel-galician.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-galician.tlpobj new/tlpkg/tlpobj/babel-galician.tlpobj --- old/tlpkg/tlpobj/babel-galician.tlpobj 2016-04-14 18:38:10.000000000 +0200 +++ new/tlpkg/tlpobj/babel-galician.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -1,6 +1,14 @@ name babel-galician category Package revision 30270 +shortdesc Babel/Polyglossia support for Galician relocated 1 +longdesc The package provides a language description file that enables +longdesc support of Galician either with babel or with polyglossia. runfiles size=7 RELOC/tex/generic/babel-galician/galician.ldf +catalogue-ctan /macros/latex/contrib/babel-contrib/galician +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 +catalogue-topics multilingual-addon +catalogue-version 4.3c ++++++ babel-georgian.doc.tar.xz ++++++ ++++++ babel-georgian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-georgian.tlpobj new/tlpkg/tlpobj/babel-georgian.tlpobj --- old/tlpkg/tlpobj/babel-georgian.tlpobj 2016-04-14 18:38:10.000000000 +0200 +++ new/tlpkg/tlpobj/babel-georgian.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/babel-georgian/georgian.sty RELOC/tex/generic/babel-georgian/georgiancaps.tex catalogue-ctan /macros/latex/contrib/babel-contrib/georgian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics georgian multilingual-addon catalogue-version 2.1 ++++++ babel-german.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-german/README new/doc/generic/babel-german/README --- old/doc/generic/babel-german/README 2014-10-11 00:04:55.000000000 +0200 +++ new/doc/generic/babel-german/README 2016-11-25 19:27:38.000000000 +0100 @@ -3,7 +3,7 @@ German language support for the babel multilingual package -Copyright 1989--2014 Johannes L. Braams +Copyright 1989--2016 Johannes L. Braams Bernd Raichle Walter Schmidt, JÃŒrgen SpitzmÃŒller @@ -71,4 +71,3 @@ See the included manuals germanb.pdf (traditional orthography) and ngermanb.pdf (new orthography), section "Change History". - Binary files old/doc/generic/babel-german/germanb.pdf and new/doc/generic/babel-german/germanb.pdf differ Binary files old/doc/generic/babel-german/ngermanb.pdf and new/doc/generic/babel-german/ngermanb.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-german.doc.tlpobj new/tlpkg/tlpobj/babel-german.doc.tlpobj --- old/tlpkg/tlpobj/babel-german.doc.tlpobj 2016-04-14 18:38:10.000000000 +0200 +++ new/tlpkg/tlpobj/babel-german.doc.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -1,9 +1,9 @@ name babel-german.doc category Package -revision 35349 +revision 42424 shortdesc doc files of babel-german relocated 1 -docfiles size=46 +docfiles size=178 RELOC/doc/generic/babel-german/README RELOC/doc/generic/babel-german/germanb.pdf RELOC/doc/generic/babel-german/ngermanb.pdf ++++++ babel-german.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/austrian.ldf new/tex/generic/babel-german/austrian.ldf --- old/tex/generic/babel-german/austrian.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/austrian.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{austrian} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/02 v2.9 German support for babel (traditional orthography)] \input germanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/german.ldf new/tex/generic/babel-german/german.ldf --- old/tex/generic/babel-german/german.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/german.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `german') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{german} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/02 v2.9 German support for babel (traditional orthography)] \input germanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/germanb.ldf new/tex/generic/babel-german/germanb.ldf --- old/tex/generic/babel-german/germanb.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/germanb.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{germanb} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/02 v2.9 German support for babel (traditional orthography)] \def\bbl@tempa{germanb} \ifx\CurrentOption\bbl@tempa \def\CurrentOption{german} @@ -51,23 +51,31 @@ \fi \LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@german\@undefined - \@nopatterns{German} + \@nopatterns{German (trad. orthography)} \adddialect\l@german0 \fi -\adddialect\l@austrian\l@german +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \ifx\l@german\@undefined + \@nopatterns{German (trad. orthography), needed by Austrian (trad. orthography)} + \adddialect\l@austrian0 + \else + \adddialect\l@austrian\l@german + \fi +\fi \def\bbl@tempa{swissgerman} \ifx\CurrentOption\bbl@tempa \ifx\l@swissgerman\@undefined \ifx\l@german\@undefined - \@nopatterns{swissgerman and german} + \@nopatterns{Swiss German (trad. orthography) and German (trad. orthography)} \adddialect\l@swissgerman0 \else - \@nopatterns{swissgerman} + \@nopatterns{Swiss German (trad. orthography)} \adddialect\l@swissgerman\l@german \fi \fi \fi -\@namedef{captionsgerman}{% +\@namedef{@captionsgerman}{% \def\prefacename{Vorwort}% \def\refname{Literatur}% \def\abstractname{Zusammenfassung}% @@ -90,23 +98,44 @@ \def\proofname{Beweis}% \def\glossaryname{Glossar}% } -\@namedef{captionsaustrian}{% - \@nameuse{captionsgerman} - \def\enclname{Beilage(n)}% +\def\bbl@tempa{german} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsgerman}{% + \@nameuse{@captionsgerman}% } -\@namedef{captionsswissgerman}{% - \@nameuse{captionsgerman} - \def\enclname{Beilage(n)}% +\fi +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsaustrian}{% + \@nameuse{@captionsgerman}% + \def\enclname{Beilage(n)}% } +\fi +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsswissgerman}{% + \@nameuse{@captionsgerman}% + \def\enclname{Beilage(n)}% + } +\fi \def\month@german{\ifcase\month\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi} -\def\dategerman{\def\today{\number\day.~\month@german - \space\number\year}} -\def\dateswissgerman{\def\today{\number\day.~\month@german - \space\number\year}} -\def\dateaustrian{\def\today{\number\day.~\ifnum1=\month - J\"anner\else \month@german\fi \space\number\year}} +\def\bbl@tempa{german} +\ifx\CurrentOption\bbl@tempa + \def\dategerman{\def\today{\number\day.~\month@german + \space\number\year}} +\fi +\def\bbl@tempa{swissgerman} +\ifx\CurrentOption\bbl@tempa + \def\dateswissgerman{\def\today{\number\day.~\month@german + \space\number\year}} +\fi +\def\bbl@tempa{austrian} +\ifx\CurrentOption\bbl@tempa + \def\dateaustrian{\def\today{\number\day.~\ifnum1=\month + J\"anner\else \month@german\fi \space\number\year}} +\fi \initiate@active@char{"} \@namedef{extras\CurrentOption}{% \languageshorthands{german}} @@ -180,6 +209,8 @@ \declare@shorthand{german}{""}{\hskip\z@skip} \declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}} \declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip} +\declare@shorthand{german}{"/}{\textormath + {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} \def\mdqon{\shorthandon{"}} \def\mdqoff{\shorthandoff{"}} \def\ck{\allowhyphens\discretionary{k-}{k}{ck}\allowhyphens} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/naustrian.ldf new/tex/generic/babel-german/naustrian.ldf --- old/tex/generic/babel-german/naustrian.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/naustrian.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{naustrian} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/02 v2.9 German support for babel (new orthography)] \input ngermanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/ngerman.ldf new/tex/generic/babel-german/ngerman.ldf --- old/tex/generic/babel-german/ngerman.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/ngerman.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `german') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{ngerman} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/02 v2.9 German support for babel (new orthography)] \input ngermanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/ngermanb.ldf new/tex/generic/babel-german/ngermanb.ldf --- old/tex/generic/babel-german/ngermanb.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/ngermanb.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,19 +33,35 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{ngermanb} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/02 v2.9 German support for babel (new orthography)] \def\bbl@tempa{ngermanb} \ifx\CurrentOption\bbl@tempa \def\CurrentOption{ngerman} \fi \LdfInit\CurrentOption{captions\CurrentOption} \ifx\l@ngerman\@undefined - \@nopatterns{ngerman} + \@nopatterns{German (new orthography)} \adddialect\l@ngerman0 \fi -\adddialect\l@naustrian\l@ngerman -\adddialect\l@nswissgerman\l@ngerman -\@namedef{captionsngerman}{% +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \ifx\l@ngerman\@undefined + \@nopatterns{German (new orthography), needed by Austrian (new orthography)} + \adddialect\l@naustrian0 + \else + \adddialect\l@naustrian\l@ngerman + \fi +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \ifx\l@ngerman\@undefined + \@nopatterns{German (new orthography), needed by Swiss German (new orthography)} + \adddialect\l@nswissgerman0 + \else + \adddialect\l@nswissgerman\l@ngerman + \fi +\fi +\@namedef{@captionsngerman}{% \def\prefacename{Vorwort}% \def\refname{Literatur}% \def\abstractname{Zusammenfassung}% @@ -68,23 +84,44 @@ \def\proofname{Beweis}% \def\glossaryname{Glossar}% } -\@namedef{captionsnaustrian}{% - \@nameuse{captionsngerman} - \def\enclname{Beilage(n)}% +\def\bbl@tempa{ngerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsngerman}{% + \@nameuse{@captionsngerman}% } -\@namedef{captionsnswissgerman}{% - \@nameuse{captionsngerman} - \def\enclname{Beilage(n)}% +\fi +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsnaustrian}{% + \@nameuse{@captionsngerman}% + \def\enclname{Beilage(n)}% } +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \@namedef{captionsnswissgerman}{% + \@nameuse{@captionsngerman}% + \def\enclname{Beilage(n)}% + } +\fi \def\month@ngerman{\ifcase\month\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi} -\def\datengerman{\def\today{\number\day.~\month@ngerman - \space\number\year}} -\def\datenswissgerman{\def\today{\number\day.~\month@ngerman - \space\number\year}} -\def\datenaustrian{\def\today{\number\day.~\ifnum1=\month - J\"anner\else \month@ngerman\fi \space\number\year}} +\def\bbl@tempa{ngerman} +\ifx\CurrentOption\bbl@tempa + \def\datengerman{\def\today{\number\day.~\month@ngerman + \space\number\year}} +\fi +\def\bbl@tempa{nswissgerman} +\ifx\CurrentOption\bbl@tempa + \def\datenswissgerman{\def\today{\number\day.~\month@ngerman + \space\number\year}} +\fi +\def\bbl@tempa{naustrian} +\ifx\CurrentOption\bbl@tempa + \def\datenaustrian{\def\today{\number\day.~\ifnum1=\month + J\"anner\else \month@ngerman\fi \space\number\year}} +\fi \initiate@active@char{"} \@namedef{extras\CurrentOption}{% \languageshorthands{ngerman}} @@ -135,6 +172,8 @@ \declare@shorthand{ngerman}{""}{\hskip\z@skip} \declare@shorthand{ngerman}{"~}{\textormath{\leavevmode\hbox{-}}{-}} \declare@shorthand{ngerman}{"=}{\penalty\@M-\hskip\z@skip} +\declare@shorthand{ngerman}{"/}{\textormath + {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} \def\mdqon{\shorthandon{"}} \def\mdqoff{\shorthandoff{"}} \ldf@finish\CurrentOption diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/nswissgerman.ldf new/tex/generic/babel-german/nswissgerman.ldf --- old/tex/generic/babel-german/nswissgerman.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/nswissgerman.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% ngermanb.dtx (with options: `swiss') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{nswissgerman} - [2013/12/13 v2.7 German support for babel (new orthography)] + [2016/11/02 v2.9 German support for babel (new orthography)] \input ngermanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-german/swissgerman.ldf new/tex/generic/babel-german/swissgerman.ldf --- old/tex/generic/babel-german/swissgerman.ldf 2014-10-11 00:04:55.000000000 +0200 +++ new/tex/generic/babel-german/swissgerman.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -7,10 +7,10 @@ %% germanb.dtx (with options: `swiss') %% This is a generated file. %% -%% Copyright 1989--2014 Johannes L. Braams -%% Bernd Raichle -%% Walter Schmidt, -%% Juergen Spitzmueller +%% Copyright 1989--2016 Johannes L. Braams +%% Bernd Raichle +%% Walter Schmidt, +%% Juergen Spitzmueller %% All rights reserved. %% %% This file is part of the babel-german bundle, @@ -33,7 +33,7 @@ %% juergen at spitzmueller dot org %% \ProvidesLanguage{swissgerman} - [2014/10/10 v2.7b German support for babel (traditional orthography)] + [2016/11/02 v2.9 German support for babel (traditional orthography)] \input germanb.ldf\relax %% %% \CharacterTable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-german.tlpobj new/tlpkg/tlpobj/babel-german.tlpobj --- old/tlpkg/tlpobj/babel-german.tlpobj 2016-04-14 18:38:10.000000000 +0200 +++ new/tlpkg/tlpobj/babel-german.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -1,12 +1,12 @@ name babel-german category Package -revision 35349 +revision 42424 shortdesc Babel support for documents written in German relocated 1 longdesc The package defines LaTeX support, within the Babel package, of longdesc German (including its Austrian dialect), in both 'old' and longdesc 'new' orthographies. -runfiles size=10 +runfiles size=11 RELOC/tex/generic/babel-german/austrian.ldf RELOC/tex/generic/babel-german/german.ldf RELOC/tex/generic/babel-german/germanb.ldf @@ -16,7 +16,7 @@ RELOC/tex/generic/babel-german/nswissgerman.ldf RELOC/tex/generic/babel-german/swissgerman.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/german -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-02 16:09:07 +0100 catalogue-license lppl1.3 catalogue-topics german multilingual-addon -catalogue-version 2.7b +catalogue-version 2.9 ++++++ babel-greek.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/README new/doc/generic/babel-greek/README --- old/doc/generic/babel-greek/README 2016-02-06 00:32:05.000000000 +0100 +++ new/doc/generic/babel-greek/README 2016-11-25 19:27:38.000000000 +0100 @@ -51,7 +51,7 @@ .. Use named macros instead of non-standard short macros for psili and dasia in the string definitions. 1.9c 2014-10-21 Fix dummy hyphenation language names (patch Ulrike Fischer). -1.9d 2015-09-04 Remove `grsymb` (macros for Greek symbols). +1.9d 2015-09-04 Remove `grsymb` (macros for Greek symbols). This package is outdated and obsoleted by greek-fontenc_ (reported by Claudio Beccari). .. Unicode uc/lc corrections now in greek-fontenc @@ -59,6 +59,8 @@ 1.9e 2015-11-27 Fix bug in lccode-setting loop (patch by Enrico Gregorio). 1.9f 2016-02-04 Support for standard Unicode text font encoding "TU" (new in fontspec v2.5a). +1.9g 2016-09-07 Babel 3.9i deprecated ``\textlatin`` + and fixed ``\latinencoding``. ===== ============ ============================================================ @@ -120,7 +122,7 @@ Usage ----- -Pass the "greek" option to babel:: +Use the "greek" document option or pass the "greek" option to babel:: \usepackage[greek]{babel} @@ -134,7 +136,7 @@ \usepackage[greek.polutoniko,english]{babel} Similarly, the attribute "ancient" selects the ancient Greek language -variant. +variant. For details see `<babel-greek.pdf>`_ and the babel_ documentation. @@ -178,9 +180,9 @@ ------------------------- The LGR font encoding allows input of Greek characters via an ASCII -transliteration. This enables simple input with a Latin keyboard. -Characters with diacritics are selected by ligature definitions in the -font (see `<usage.pdf>`_). +transliteration. This enables simple input with a Latin keyboard. Characters +with diacritics may be selected with accent macros (cf. greek-fontenc_) or +via the ligature definitions in the font (see `<usage.pdf>`_). The following ASCII characters are converted to Greek symbols: @@ -198,7 +200,7 @@ varia \` áœ° question mark ``?`` ; perispomeni ``~`` áŸ¶ left apostrophe \` \` â dasia ``<`` áŒ right apostrophe ``''`` â -psili ``>`` áŒ left quotation mark ``((`` Â» +psili ``>`` áŒ left quotation mark ``((`` Â« ypogegrammeni ``|`` áŸ³ right quotation mark ``))`` Â» dialytika ``"`` Ï zero width non-joiner v ================= ===== == ====================== ======== ==== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/README.html new/doc/generic/babel-greek/README.html --- old/doc/generic/babel-greek/README.html 2016-02-06 00:32:05.000000000 +0100 +++ new/doc/generic/babel-greek/README.html 2016-11-25 19:27:38.000000000 +0100 @@ -1,7 +1,7 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta charset="utf-8"/> <meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>babel-greek</title> <style type="text/css"> @@ -9,7 +9,7 @@ /* Minimal style sheet for the HTML output of Docutils. */ /* */ /* :Author: GÃŒnter Milde, based on html4css1.css by David Goodger */ -/* :Id: $Id: minimal.css 7916 2015-09-11 15:20:14Z milde $ */ +/* :Id: $Id: minimal.css 7952 2016-07-26 18:15:59Z milde $ */ /* :Copyright: Â© 2015 GÃŒnter Milde. */ /* :License: Released under the terms of the `2-Clause BSD license`_, */ /* in short: */ @@ -28,10 +28,13 @@ /* .. _CSS2.1: http://www.w3.org/TR/CSS2 */ /* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */ -/* Figure/table alignment */ -.align-left { text-align: left; } -.align-right { text-align: right; } -.align-center { clear: both; text-align: center;} +/* alignment of text and inline objects inside block objects*/ +.align-left { text-align: left; } +.align-right { text-align: right; } +.align-center { clear: both; text-align: center; } +.align-top { vertical-align: top; } +.align-middle { vertical-align: middle; } +.align-bottom { vertical-align: bottom; } /* titles */ h1.title, p.subtitle { @@ -184,28 +187,34 @@ margin-left: 40px; } -/* Images and Figures */ -img.align-left, +/* Figures, Images, and Tables */ .figure.align-left, -object.align-left { - display: block; +img.align-left, +object.align-left, +table.align-left { margin-right: auto; } -img.align-center, .figure.align-center, +img.align-center, object.align-center { + margin-left: auto; + margin-right: auto; display: block; +} +table.align-center { margin-left: auto; margin-right: auto; } -img.align-right, .figure.align-right, -object.align-right { - display: block; +img.align-right, +object.align-right, +table.align-right { margin-left: auto; } -/* reset inner alignment in figures */ -div.align-right { text-align: inherit } +/* reset inner alignment in figures and tables */ +div.align-left, div.align-center, div.align-right, +table.align-left, table.align-center, table.align-right +{ text-align: inherit } /* Admonitions and System Messages */ div.admonition, @@ -265,7 +274,7 @@ /* Rules for easy reading and pre-defined style variants. */ /* */ /* :Author: GÃŒnter Milde, based on html4css1.css by David Goodger */ -/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */ +/* :Id: $Id: plain.css 7952 2016-07-26 18:15:59Z milde $ */ /* :Copyright: Â© 2015 GÃŒnter Milde. */ /* :License: Released under the terms of the `2-Clause BSD license`_, */ /* in short: */ @@ -416,6 +425,8 @@ /* th { vertical-align: bottom; } */ +table tr { text-align: left; } + /* "booktabs" style (no vertical lines) */ table.booktabs { border: 0; @@ -428,7 +439,6 @@ } table.booktabs th { border-bottom: thin solid; - text-align: left; } /* numbered tables (counter defined in div.document) */ @@ -458,16 +468,20 @@ /* ~~~~~~~~~~~~~ */ /* Images and Figures */ -img.align-left, + +/* let content flow to the side of aligned images and figures */ .figure.align-left, +img.align-left, object.align-left { + display: block; clear: left; float: left; margin-right: 1em } -img.align-right, .figure.align-right, +img.align-right, object.align-right { + display: block; clear: right; float: right; margin-left: 1em @@ -694,6 +708,11 @@ <td><p>Support for standard Unicode text font encoding âTUâ (new in fontspec v2.5a).</p></td> </tr> +<tr><td><p>1.9g</p></td> +<td><p>2016-09-07</p></td> +<td><p>Babel 3.9i deprecated <span class="docutils literal">\textlatin</span> +and fixed <span class="docutils literal">\latinencoding</span>.</p></td> +</tr> </tbody> </table> </div> @@ -747,7 +766,7 @@ </div> <div class="section" id="usage"> <h1>Usage</h1> -<p>Pass the âgreekâ option to babel:</p> +<p>Use the âgreekâ document option or pass the âgreekâ option to babel:</p> <pre class="literal-block">\usepackage[greek]{babel}</pre> <p>For polytonic Greek, set the language attribute âpolutonikoâ:</p> <pre class="literal-block">\usepackage[greek]{babel} @@ -789,9 +808,9 @@ <div class="section" id="lgr-latin-transliteration"> <h1>LGR Latin Transliteration</h1> <p>The LGR font encoding allows input of Greek characters via an ASCII -transliteration. This enables simple input with a Latin keyboard. -Characters with diacritics are selected by ligature definitions in the -font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> +transliteration. This enables simple input with a Latin keyboard. Characters +with diacritics may be selected with accent macros (cf. <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>) or +via the ligature definitions in the font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <p>The following ASCII characters are converted to Greek symbols:</p> <table> <colgroup> @@ -972,7 +991,7 @@ <td><p>áŒ</p></td> <td><p>left quotation mark</p></td> <td><p><span class="docutils literal">((</span></p></td> -<td><p>Â»</p></td> +<td><p>Â«</p></td> </tr> <tr><td><p>ypogegrammeni</p></td> <td><p><span class="docutils literal">|</span></p></td> Binary files old/doc/generic/babel-greek/babel-greek.pdf and new/doc/generic/babel-greek/babel-greek.pdf differ Binary files old/doc/generic/babel-greek/test-greek.pdf and new/doc/generic/babel-greek/test-greek.pdf differ Binary files old/doc/generic/babel-greek/test-unicode-greek.pdf and new/doc/generic/babel-greek/test-unicode-greek.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/test-unicode-greek.tex new/doc/generic/babel-greek/test-unicode-greek.tex --- old/doc/generic/babel-greek/test-unicode-greek.tex 2016-02-06 00:32:05.000000000 +0100 +++ new/doc/generic/babel-greek/test-unicode-greek.tex 2016-11-25 19:27:38.000000000 +0100 @@ -24,7 +24,7 @@ \title{Greek support for Babel with XeTeX/LuaTeX} \author{GÃŒnter Milde} -\date{2016/02/04} +\date{2016/09/07} \maketitle The babel option Â«greekÂ» activates the support for the Greek language @@ -61,9 +61,8 @@ The LGR font encoding does not support Latin characters. Therefore, the Babel core defines the declaration \verb|\latintext| and the command -\verb|\textlatin| to switch to the T1 or OT1 font encoding or typeset the -argument using this encoding. \texttt{babel-greek} adds a test for the -Unicode text encodings (TU, EU1, EU2). At this point, the Â«latinencodingÂ» +\verb|\textlatin| to switch to the TU, EU1, EU2, T1 or OT1 font encoding or +typeset the argument using this encoding. At this point, the Â«latinencodingÂ» is \latinencoding. Every language switch from \texttt{greek} calls the \verb|\noextrasgreek| @@ -100,8 +99,8 @@ With this setup, it is also possible to use accent macros instead of pre-composed Unicode characters for letters with diacritics: -Â«Î€\'Î¹ Ï\'Î·Î¹ÏÍŸÂ», Â«\`<Î¿ÏÎ±Â». \accdasiavaria Î¿ÏÎ± - +Â«Î€\'Î¹ Ï\'Î·Î¹ÏÍŸÂ», Â«\`<Î¿ÏÎ± = \accdasiavaria{Î¿}ÏÎ±Â». + \subsection{Captions} Binary files old/doc/generic/babel-greek/usage.pdf and new/doc/generic/babel-greek/usage.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-greek.doc.tlpobj new/tlpkg/tlpobj/babel-greek.doc.tlpobj --- old/tlpkg/tlpobj/babel-greek.doc.tlpobj 2016-04-19 17:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/babel-greek.doc.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -1,9 +1,9 @@ name babel-greek.doc category Package -revision 40613 +revision 42010 shortdesc doc files of babel-greek relocated 1 -docfiles size=281 +docfiles size=282 RELOC/doc/generic/babel-greek/README RELOC/doc/generic/babel-greek/README.html RELOC/doc/generic/babel-greek/athnum.pdf ++++++ babel-greek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-greek/greek.ldf new/tex/generic/babel-greek/greek.ldf --- old/tex/generic/babel-greek/greek.ldf 2016-02-06 00:32:05.000000000 +0100 +++ new/tex/generic/babel-greek/greek.ldf 2016-11-25 19:33:32.000000000 +0100 @@ -32,7 +32,7 @@ %% and covered by LPPL is defined by the unpacking script (babel-greek.ins) %% which is part of the package. \ProvidesLanguage{greek} - [2016/02/04 v1.9f Greek support for the babel system] + [2016/09/07 v1.9g Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright Â© 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -104,21 +104,16 @@ \def\encodingdefault{\greekfontencoding}} \ProvideTextCommandDefault{\ensuregreek}[1]{% \leavevmode{\greekscript #1}} -\AtBeginDocument{% - \@ifl@aded{def}{eu1enc}{\xdef\latinencoding{EU1}}{}% XeTeX - \@ifl@aded{def}{eu2enc}{\xdef\latinencoding{EU2}}{}% LuaTeX - \@ifl@aded{def}{tuenc}{\xdef\latinencoding{TU}}{}% fontspec >= 2.5a -} \@ifl@aded{def}{lgrenc}{% - \ProvideTextCommand{\textcopyright}{LGR}{\textlatin{\textcopyright}} - \ProvideTextCommand{\textregistered}{LGR}{\textlatin{\textregistered}} - \ProvideTextCommand{\texttrademark}{LGR}{\textlatin{\texttrademark}} + \ProvideTextCommand{\textcopyright}{LGR}{\ensureascii{\textcopyright}} + \ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}} + \ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}} \let\ltx@amp\& \DeclareTextCommandDefault{\&}{\ltx@amp} - \DeclareTextCommand{\&}{LGR}{\textlatin{\ltx@amp}} - \ProvideTextCommand{\SS}{LGR}{\textlatin{\SS}} - \def\@roman#1{\expandafter\textlatin\expandafter{\romannumeral#1}} - \def\@Roman#1{\expandafter\textlatin\expandafter{% + \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}} + \ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}} + \def\@roman#1{\expandafter\ensureascii\expandafter{\romannumeral#1}} + \def\@Roman#1{\expandafter\ensureascii\expandafter{% \expandafter\@slowromancap\romannumeral#1@}} \DeclareRobustCommand{\greektext}{% \fontencoding{LGR}\selectfont diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-greek.tlpobj new/tlpkg/tlpobj/babel-greek.tlpobj --- old/tlpkg/tlpobj/babel-greek.tlpobj 2016-04-19 17:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/babel-greek.tlpobj 2017-04-14 17:29:29.000000000 +0200 @@ -1,18 +1,18 @@ name babel-greek category Package -revision 40613 +revision 42010 shortdesc Babel support for documents written in Greek relocated 1 longdesc The file provides modes for monotonic (single-diacritic) and longdesc polytonic (multiple-diacritic) modes of writing. Provision is longdesc made for Greek function names in mathematics, and for classical- longdesc era symbols. -runfiles size=8 +runfiles size=7 RELOC/tex/generic/babel-greek/athnum.sty RELOC/tex/generic/babel-greek/greek.ldf RELOC/tex/generic/babel-greek/grmath.sty catalogue-ctan /macros/latex/contrib/babel-contrib/greek -catalogue-date 2016-02-05 07:20:04 +0100 +catalogue-date 2017-01-25 22:09:11 +0100 catalogue-license lppl1.3 catalogue-topics greek multilingual-addon -catalogue-version 1.9f +catalogue-version 1.9g ++++++ babel-hebrew.doc.tar.xz ++++++ ++++++ babel-hebrew.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-hebrew.tlpobj new/tlpkg/tlpobj/babel-hebrew.tlpobj --- old/tlpkg/tlpobj/babel-hebrew.tlpobj 2016-04-14 18:38:12.000000000 +0200 +++ new/tlpkg/tlpobj/babel-hebrew.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -44,7 +44,7 @@ RELOC/tex/generic/babel-hebrew/rlbabel.def RELOC/tex/generic/babel-hebrew/si960.def catalogue-ctan /macros/latex/contrib/babel-contrib/hebrew -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics hebrew catalogue-version 2.3h ++++++ babel-hungarian.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-hungarian.doc.tlpobj new/tlpkg/tlpobj/babel-hungarian.doc.tlpobj --- old/tlpkg/tlpobj/babel-hungarian.doc.tlpobj 2016-04-14 18:38:12.000000000 +0200 +++ new/tlpkg/tlpobj/babel-hungarian.doc.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -1,6 +1,6 @@ name babel-hungarian.doc category Package -revision 38945 +revision 41435 shortdesc doc files of babel-hungarian relocated 1 docfiles size=1 ++++++ babel-hungarian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-hungarian.tlpobj new/tlpkg/tlpobj/babel-hungarian.tlpobj --- old/tlpkg/tlpobj/babel-hungarian.tlpobj 2016-04-14 18:38:12.000000000 +0200 +++ new/tlpkg/tlpobj/babel-hungarian.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -1,6 +1,6 @@ name babel-hungarian category Package -revision 38945 +revision 41435 shortdesc Babel support for Hungarian (Magyar) relocated 1 longdesc The package provides a language definition file that enables @@ -8,7 +8,7 @@ runfiles size=61 RELOC/tex/generic/babel-hungarian/magyar.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/hungarian -catalogue-date 2015-11-25 22:07:45 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics multilingual-addon hungarian catalogue-version 1.5c ++++++ babel-icelandic.doc.tar.xz ++++++ ++++++ babel-icelandic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-icelandic.tlpobj new/tlpkg/tlpobj/babel-icelandic.tlpobj --- old/tlpkg/tlpobj/babel-icelandic.tlpobj 2016-04-14 18:38:13.000000000 +0200 +++ new/tlpkg/tlpobj/babel-icelandic.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/generic/babel-icelandic/icelandic.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/icelandic -catalogue-date 2016-01-14 19:51:09 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics icelandic catalogue-version 1.2b ++++++ babel-interlingua.doc.tar.xz ++++++ ++++++ babel-interlingua.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-interlingua.tlpobj new/tlpkg/tlpobj/babel-interlingua.tlpobj --- old/tlpkg/tlpobj/babel-interlingua.tlpobj 2016-04-14 18:38:13.000000000 +0200 +++ new/tlpkg/tlpobj/babel-interlingua.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/generic/babel-interlingua/interlingua.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/interlingua -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics interlingua catalogue-version 1.6 ++++++ babel-irish.doc.tar.xz ++++++ ++++++ babel-irish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-irish.tlpobj new/tlpkg/tlpobj/babel-irish.tlpobj --- old/tlpkg/tlpobj/babel-irish.tlpobj 2016-04-14 18:38:13.000000000 +0200 +++ new/tlpkg/tlpobj/babel-irish.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-irish/irish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/irish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics irish-gaelic catalogue-version 1.0h ++++++ babel-italian.doc.tar.xz ++++++ ++++++ babel-italian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-italian.tlpobj new/tlpkg/tlpobj/babel-italian.tlpobj --- old/tlpkg/tlpobj/babel-italian.tlpobj 2016-04-14 18:38:14.000000000 +0200 +++ new/tlpkg/tlpobj/babel-italian.tlpobj 2017-04-14 17:29:30.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=3 RELOC/tex/generic/babel-italian/italian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/italian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics italian multilingual-addon catalogue-version 1.3n ++++++ babel-kurmanji.doc.tar.xz ++++++ ++++++ babel-kurmanji.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-kurmanji.tlpobj new/tlpkg/tlpobj/babel-kurmanji.tlpobj --- old/tlpkg/tlpobj/babel-kurmanji.tlpobj 2016-04-14 18:38:14.000000000 +0200 +++ new/tlpkg/tlpobj/babel-kurmanji.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/generic/babel-kurmanji/kurmanji.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/kurmanji -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics kurmanji multilingual-addon catalogue-version 1.1 ++++++ babel-latin.doc.tar.xz ++++++ ++++++ babel-latin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-latin.tlpobj new/tlpkg/tlpobj/babel-latin.tlpobj --- old/tlpkg/tlpobj/babel-latin.tlpobj 2016-04-14 18:38:14.000000000 +0200 +++ new/tlpkg/tlpobj/babel-latin.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/generic/babel-latin/latin.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/latin -catalogue-date 2015-08-21 11:47:02 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics latin multilingual-addon catalogue-version 3.5 ++++++ babel-latvian.doc.tar.xz ++++++ ++++++ babel-latvian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-latvian.tlpobj new/tlpkg/tlpobj/babel-latvian.tlpobj --- old/tlpkg/tlpobj/babel-latvian.tlpobj 2016-04-14 18:38:14.000000000 +0200 +++ new/tlpkg/tlpobj/babel-latvian.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/generic/babel-latvian/latvian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/latvian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics latvian multilingual-addon catalogue-version 2.0a ++++++ babel-macedonian.doc.tar.xz ++++++ ++++++ babel-macedonian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-macedonian.tlpobj new/tlpkg/tlpobj/babel-macedonian.tlpobj --- old/tlpkg/tlpobj/babel-macedonian.tlpobj 2016-04-14 18:38:14.000000000 +0200 +++ new/tlpkg/tlpobj/babel-macedonian.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=4 RELOC/tex/generic/babel-macedonian/macedonian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/macedonian -catalogue-date 2016-02-05 17:30:25 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macedonian multilingual-addon ++++++ babel-norsk.doc.tar.xz ++++++ ++++++ babel-norsk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-norsk.tlpobj new/tlpkg/tlpobj/babel-norsk.tlpobj --- old/tlpkg/tlpobj/babel-norsk.tlpobj 2016-04-14 18:38:15.000000000 +0200 +++ new/tlpkg/tlpobj/babel-norsk.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/babel-norsk/norsk.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/norsk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics norsk multilingual-addon catalogue-version 2.0i ++++++ babel-occitan.doc.tar.xz ++++++ ++++++ babel-occitan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-occitan.tlpobj new/tlpkg/tlpobj/babel-occitan.tlpobj --- old/tlpkg/tlpobj/babel-occitan.tlpobj 2016-04-14 18:38:15.000000000 +0200 +++ new/tlpkg/tlpobj/babel-occitan.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=2 RELOC/tex/generic/babel-occitan/occitan.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/occitan -catalogue-date 2016-02-09 06:58:22 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon occitan catalogue-version 0.2 ++++++ babel-piedmontese.doc.tar.xz ++++++ ++++++ babel-piedmontese.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-piedmontese.tlpobj new/tlpkg/tlpobj/babel-piedmontese.tlpobj --- old/tlpkg/tlpobj/babel-piedmontese.tlpobj 2016-04-14 18:38:15.000000000 +0200 +++ new/tlpkg/tlpobj/babel-piedmontese.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-piedmontese/piedmontese.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/piedmontese -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics piedmontese multilingual-addon catalogue-version 1.0 ++++++ babel-polish.doc.tar.xz ++++++ ++++++ babel-polish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-polish.tlpobj new/tlpkg/tlpobj/babel-polish.tlpobj --- old/tlpkg/tlpobj/babel-polish.tlpobj 2016-04-14 18:38:15.000000000 +0200 +++ new/tlpkg/tlpobj/babel-polish.tlpobj 2017-04-14 17:29:31.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/generic/babel-polish/polish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/polish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics polish catalogue-version 1.2l ++++++ babel-portuges.doc.tar.xz ++++++ ++++++ babel-portuges.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-portuges.tlpobj new/tlpkg/tlpobj/babel-portuges.tlpobj --- old/tlpkg/tlpobj/babel-portuges.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-portuges.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/generic/babel-portuges/portuges.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/portuges -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics portuguese portuguese-br catalogue-version 1.2q ++++++ babel-romanian.doc.tar.xz ++++++ ++++++ babel-romanian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-romanian.tlpobj new/tlpkg/tlpobj/babel-romanian.tlpobj --- old/tlpkg/tlpobj/babel-romanian.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-romanian.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-romanian/romanian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/romanian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics romanian catalogue-version 1.2l ++++++ babel-romansh.doc.tar.xz ++++++ ++++++ babel-romansh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-romansh.tlpobj new/tlpkg/tlpobj/babel-romansh.tlpobj --- old/tlpkg/tlpobj/babel-romansh.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-romansh.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=1 RELOC/tex/generic/babel-romansh/romansh.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/romansh -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon ++++++ babel-russian.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-russian/README new/doc/generic/babel-russian/README --- old/doc/generic/babel-russian/README 2016-02-20 00:38:49.000000000 +0100 +++ new/doc/generic/babel-russian/README 2017-01-07 00:01:03.000000000 +0100 @@ -1,6 +1,6 @@ ---------------------------------------------------------------- -Russian language module for Babel, v1.3h +Russian language module for Babel, v1.3i Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -65,7 +65,8 @@ \usepackage[english,russian]{babel} Instead of the Computer Modern Unicode (CMU) fonts loaded in this example, -you may use any True Type or Open Type fonts installed on your computer. +you may try any True Type or Open Type font installed on your computer provided +that that font came with Russian letters. 2.3 Typesetting ancient book @@ -106,6 +107,10 @@ 5. CHANGES +2017-01-12 version 1.3i + + * Bug fixed in \NOD, \NOK and similar log-functions (thanks to V. Vlasov). + 2016-02-18 version 1.3h * Bugs fixed in captions for revtex4 and revtex4-1 classes. Binary files old/doc/generic/babel-russian/russianb.pdf and new/doc/generic/babel-russian/russianb.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-russian.doc.tlpobj new/tlpkg/tlpobj/babel-russian.doc.tlpobj --- old/tlpkg/tlpobj/babel-russian.doc.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-russian.doc.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -1,8 +1,8 @@ name babel-russian.doc category Package -revision 39784 +revision 42885 shortdesc doc files of babel-russian relocated 1 -docfiles size=36 +docfiles size=37 RELOC/doc/generic/babel-russian/README RELOC/doc/generic/babel-russian/russianb.pdf ++++++ babel-russian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-russian/russianb.ldf new/tex/generic/babel-russian/russianb.ldf --- old/tex/generic/babel-russian/russianb.ldf 2016-02-20 00:38:49.000000000 +0100 +++ new/tex/generic/babel-russian/russianb.ldf 2017-01-07 00:01:05.000000000 +0100 @@ -12,7 +12,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesLanguage{russianb}[2016/02/18 1.3h Russian support for the Babel system] +\ProvidesLanguage{russianb}[2017/01/12 1.3i Russian support for the Babel system] \LdfInit{russian}{captionsrussian} \ifdefined\if@uni@ode \PackageError{babel}{if@uni@ode already defined.\MessageBreak @@ -551,15 +551,15 @@ \def\NOK{\mathop{\mathrm{ÐÐÐ}}\nolimits} \def\Proj{\mathop{\mathrm{ÐÑ}}\nolimits} \else - \def\nod{\mathop{\cyrmathrm{\cyrn.\cyro.\cyrd.}}\nolimits} - \def\nok{\mathop{\cyrmathrm{\cyrn.\cyro.\cyrk.}}\nolimits} - \def\NOD{\mathop{\cyrmathrm{\CYRN\CYRO\CYRD}}\nolimits} - \def\NOK{\mathop{\cyrmathrm{\CYRN\CYRO\CYRK}}\nolimits} - \def\Proj{\mathop{\cyrmathrm{\CYRP\cyrr}}\nolimits} + \def\nod{\mathop{\textrm{\textup{\cyrn.\cyro.\cyrd.}}}\nolimits} + \def\nok{\mathop{\textrm{\textup{\cyrn.\cyro.\cyrk.}}}\nolimits} + \def\NOD{\mathop{\textrm{\textup{\CYRN\CYRO\CYRD}}}\nolimits} + \def\NOK{\mathop{\textrm{\textup{\CYRN\CYRO\CYRK}}}\nolimits} + \def\Proj{\mathop{\textrm{\textup{\CYRP\cyrr}}}\nolimits} \fi \ldf@finish{russian} %% ---------------------------------------------------------------- -%% Copyright 2011-2014 Igor A. Kotelnikov. +%% Copyright 2011-2017 Igor A. Kotelnikov. %% Copyright 1995-2008 Olga Lapko. %% Copyright 1989-2012 Johannes L. Braams. %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-russian.tlpobj new/tlpkg/tlpobj/babel-russian.tlpobj --- old/tlpkg/tlpobj/babel-russian.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-russian.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -1,6 +1,6 @@ name babel-russian category Package -revision 39784 +revision 42885 shortdesc Russian language module for Babel relocated 1 longdesc The package provides support for use of Babel in documents @@ -10,7 +10,7 @@ runfiles size=6 RELOC/tex/generic/babel-russian/russianb.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/russian -catalogue-date 2016-02-19 05:53:21 +0100 +catalogue-date 2017-01-06 05:24:54 +0100 catalogue-license lppl1.3 catalogue-topics multilingual-addon russian -catalogue-version 1.3h +catalogue-version 1.3i ++++++ babel-samin.doc.tar.xz ++++++ ++++++ babel-samin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-samin.tlpobj new/tlpkg/tlpobj/babel-samin.tlpobj --- old/tlpkg/tlpobj/babel-samin.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-samin.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/generic/babel-samin/samin.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/samin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics samin catalogue-version 1.0c ++++++ babel-scottish.doc.tar.xz ++++++ ++++++ babel-scottish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-scottish.tlpobj new/tlpkg/tlpobj/babel-scottish.tlpobj --- old/tlpkg/tlpobj/babel-scottish.tlpobj 2016-04-14 18:38:16.000000000 +0200 +++ new/tlpkg/tlpobj/babel-scottish.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-scottish/scottish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/scottish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics scottish multilingual-addon catalogue-version 1.0g ++++++ babel-serbian.doc.tar.xz ++++++ ++++++ babel-serbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbian.tlpobj new/tlpkg/tlpobj/babel-serbian.tlpobj --- old/tlpkg/tlpobj/babel-serbian.tlpobj 2016-04-14 18:38:17.000000000 +0200 +++ new/tlpkg/tlpobj/babel-serbian.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -1,6 +1,14 @@ name babel-serbian category Package revision 30290 +shortdesc Babel/Polyglossia support for Serbian relocated 1 +longdesc The package provides a language description file that enables +longdesc support of Serbian either with babel or with polyglossia. runfiles size=2 RELOC/tex/generic/babel-serbian/serbian.ldf +catalogue-ctan /macros/latex/contrib/babel-contrib/serbian +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 +catalogue-topics multilingual-addon +catalogue-version 1.0d ++++++ babel-serbianc.doc.tar.xz ++++++ ++++++ babel-serbianc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbianc.tlpobj new/tlpkg/tlpobj/babel-serbianc.tlpobj --- old/tlpkg/tlpobj/babel-serbianc.tlpobj 2016-04-14 18:38:17.000000000 +0200 +++ new/tlpkg/tlpobj/babel-serbianc.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/generic/babel-serbianc/serbianc.ldf RELOC/tex/generic/babel-serbianc/serbianc.sty catalogue-ctan /macros/latex/contrib/babel-contrib/serbianc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics serbian multilingual-addon catalogue-version 2.2 ++++++ babel-slovak.doc.tar.xz ++++++ ++++++ babel-slovak.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-slovak.tlpobj new/tlpkg/tlpobj/babel-slovak.tlpobj --- old/tlpkg/tlpobj/babel-slovak.tlpobj 2016-04-14 18:38:17.000000000 +0200 +++ new/tlpkg/tlpobj/babel-slovak.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/generic/babel-slovak/slovak.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/slovak -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics slovak multilingual-addon catalogue-version 3.1a ++++++ babel-slovenian.doc.tar.xz ++++++ ++++++ babel-slovenian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-slovenian.tlpobj new/tlpkg/tlpobj/babel-slovenian.tlpobj --- old/tlpkg/tlpobj/babel-slovenian.tlpobj 2016-04-14 18:38:17.000000000 +0200 +++ new/tlpkg/tlpobj/babel-slovenian.tlpobj 2017-04-14 17:29:32.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/babel-slovenian/slovene.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/slovenian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics slovenian multilingual-addon catalogue-version 1.2i ++++++ babel-sorbian.doc.tar.xz ++++++ ++++++ babel-sorbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-sorbian.tlpobj new/tlpkg/tlpobj/babel-sorbian.tlpobj --- old/tlpkg/tlpobj/babel-sorbian.tlpobj 2016-04-14 18:38:18.000000000 +0200 +++ new/tlpkg/tlpobj/babel-sorbian.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/babel-sorbian/lsorbian.ldf RELOC/tex/generic/babel-sorbian/usorbian.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/sorbian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics sorbian catalogue-version lower sorbian:1.0g, upper:1.0k ++++++ babel-spanglish.doc.tar.xz ++++++ ++++++ babel-spanglish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-spanglish.tlpobj new/tlpkg/tlpobj/babel-spanglish.tlpobj --- old/tlpkg/tlpobj/babel-spanglish.tlpobj 2016-04-14 18:38:18.000000000 +0200 +++ new/tlpkg/tlpobj/babel-spanglish.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/generic/babel-spanglish/spanglish.ldf RELOC/tex/generic/babel-spanglish/spanglish.sty catalogue-ctan /macros/latex/contrib/babel-contrib/spanglish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics spanish multilingual-addon catalogue-version 0.3 ++++++ babel-spanish.doc.tar.xz ++++++ ++++++ babel-spanish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-spanish.tlpobj new/tlpkg/tlpobj/babel-spanish.tlpobj --- old/tlpkg/tlpobj/babel-spanish.tlpobj 2016-04-14 18:38:18.000000000 +0200 +++ new/tlpkg/tlpobj/babel-spanish.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/babel-spanish/romanidx.sty RELOC/tex/generic/babel-spanish/spanish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/spanish -catalogue-date 2016-03-02 19:32:26 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics spanish multilingual-addon catalogue-version 5.0p ++++++ babel-swedish.doc.tar.xz ++++++ ++++++ babel-swedish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-swedish.tlpobj new/tlpkg/tlpobj/babel-swedish.tlpobj --- old/tlpkg/tlpobj/babel-swedish.tlpobj 2016-04-14 18:38:18.000000000 +0200 +++ new/tlpkg/tlpobj/babel-swedish.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=2 RELOC/tex/generic/babel-swedish/swedish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/swedish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics swedish multilingual-addon catalogue-version 2.3d ++++++ babel-thai.doc.tar.xz ++++++ ++++++ babel-thai.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-thai.tlpobj new/tlpkg/tlpobj/babel-thai.tlpobj --- old/tlpkg/tlpobj/babel-thai.tlpobj 2016-04-14 18:38:19.000000000 +0200 +++ new/tlpkg/tlpobj/babel-thai.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/babel-thai/thai.ldf RELOC/tex/generic/babel-thai/tis620.def catalogue-ctan /macros/latex/contrib/babel-contrib/thai -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics thai multilingual-addon catalogue-version 1.0.0 ++++++ babel-turkish.doc.tar.xz ++++++ ++++++ babel-turkish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-turkish.tlpobj new/tlpkg/tlpobj/babel-turkish.tlpobj --- old/tlpkg/tlpobj/babel-turkish.tlpobj 2016-04-14 18:38:19.000000000 +0200 +++ new/tlpkg/tlpobj/babel-turkish.tlpobj 2017-04-14 17:29:33.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/generic/babel-turkish/turkish.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/turkish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics turkish multilingual-addon catalogue-version 1.3b ++++++ babel-ukrainian.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-ukrainian/README.md new/doc/generic/babel-ukrainian/README.md --- old/doc/generic/babel-ukrainian/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/babel-ukrainian/README.md 2017-06-10 23:33:34.000000000 +0200 @@ -0,0 +1,122 @@ +---------------------------------------------------------------- + +Ukrainian language module for Babel, v1.4 + +Released under the LaTeX Project Public License v1.3c or later. +See http://www.latex-project.org/lppl.txt + +The package provides support for use of Babel in documents written in Ukrainian. The support is adapted for use both +under legacy TEX engines, and under XâTEX and LuaTEX. + +Based on Russian language module v1.3i by Igor A. Kotelnikov <kia999 at mail dot ru>. + +The Current Maintainer is Sergiy Ponomarenko <sergiy.ponomarenko(a)gmail.com>. + +1. INSTALLATION + +- unpack babel-ukrainian.zip +- run "xelatex.exe ukraineb.dtx" (recommended) + or "pdflatex.exe ukraineb.dtx"; + run "tex.exe ukraineb.dtx" + or "tex.exe ukraineb.ins", if you don't need documentation +- move "ukraineb.ldf" to <textmf>/tex/generic/babel/babel-ukrainian/ +- move "ukraineb.pdf" and README to <textmf>/doc/generic/babel-ukrainian/ +- update filename base (see documentation for your TeX system) + +2. USAGE + +Ukrainian language definition file can be used both with legacy 8-bit engines +(such as latex.exe or pdflatex.exe) and Unicode compilers (xelatex.exe or +lualatex.exe). The Unicode engines can be ran either in Unicode mode or 8-bit +compatibility mode, which emulates the legacy engines. The two modes differ by +a set of packages loaded in the preamble of a source TeX file. It is important +to keep recommended order of the packages loaded, especially when running +Unicode engines in a compatibility 8-bit mode. + +In the examples below, it is assumed that a source file has utf8 input encoding. + +2.1. 8-bit mode + +2.1.1 PDFLATeX, LaTeX + + \usepackage[T1,T2A]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage[english,ukrainian]{babel} + +2.1.2 LuaLaTeX + + \usepackage[T1,T2A]{fontenc} + \usepackage[lutf8]{luainputenc} + \usepackage[english,ukrainian]{babel} + +2.1.3 XeLaTeX + + \XeTeXinputencoding "bytes" + \usepackage[utf8]{inputenc} + \usepackage[T2A]{fontenc} + \usepackage[english,ukrainian]{babel} + +2.2 Unicode mode, LuaLaTeX or XeLaTeX + + \usepackage{fontspec} + \defaultfontfeatures{Ligatures={TeX}} + \setmainfont{CMU Serif} + \setsansfont{CMU Sans Serif} + \setmonofont{CMU Typewriter Text} + \usepackage[english,ukrainian]{babel} + +Instead of the Computer Modern Unicode (CMU) fonts loaded in this example, +you may try any True Type or Open Type font installed on your computer provided +that that font came with Ukrainian letters. + +3. DOCUMENTATION + +See ukraineb.pdf for more information. + +4. KNOWN PROBLEMS + +Before switching from a legacy 8-bit engine (tex, pdftex) to an Unicode +engine (xetex, luatex) and vise versa delete all .aux, .toc, .lot, .lof +files as they might have stored incompatible internal encodings. + +5. CHANGES + +2017-06-10 version 1.4 + + * For compatibility with older Ukrainian packages we leave definition of the \No macro + * Fix Ukrainian translation of babel unicode string \chaptername + * Macros \Asbuk and \asbuk are removed + * Cyrillic alphabetical enumeration is provided by \Alph and \alph macros when Ukrainian loaded + * Used babel's 3.9 (and later) macros for defining caption names and date for Unicode case + +2017-06-08 version 1.3i + + * Corrections according to alphabetical enumeration Ukrainian standart ÐÐ¡Ð¢Ð£ 3008:2015 + * Some math macro from original russian.ldf was removed because of seldom usage + +2017-06-06 version 1.3h + + * Initial version + +Original source: russianb.dtx, + 2017-01-12 v1.3i Russian support from the babel system. + +---------------------------------------------------------------- +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% + Binary files old/doc/generic/babel-ukrainian/ukraineb.pdf and new/doc/generic/babel-ukrainian/ukraineb.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-ukrainian.doc.tlpobj new/tlpkg/tlpobj/babel-ukrainian.doc.tlpobj --- old/tlpkg/tlpobj/babel-ukrainian.doc.tlpobj 2016-04-25 03:14:21.000000000 +0200 +++ new/tlpkg/tlpobj/babel-ukrainian.doc.tlpobj 2017-06-11 02:21:20.000000000 +0200 @@ -1,7 +1,8 @@ name babel-ukrainian.doc category Package -revision 40730 +revision 44550 shortdesc doc files of babel-ukrainian relocated 1 -docfiles size=53 +docfiles size=112 + RELOC/doc/generic/babel-ukrainian/README.md RELOC/doc/generic/babel-ukrainian/ukraineb.pdf ++++++ babel-ukrainian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-ukrainian/ukraineb.ldf new/tex/generic/babel-ukrainian/ukraineb.ldf --- old/tex/generic/babel-ukrainian/ukraineb.ldf 2016-04-25 00:19:59.000000000 +0200 +++ new/tex/generic/babel-ukrainian/ukraineb.ldf 2017-06-10 23:33:34.000000000 +0200 @@ -5,216 +5,124 @@ %% The original source files were: %% %% ukraineb.dtx (with options: `code') -%% This is a generated file. -%% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors -%% listed elsewhere in this file. All rights reserved. -%% -%% This file was generated from file(s) of the Babel system. -%% --------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% The Current Maintainer of this work is Johannes Braams. -%% -%% This file may only be distributed together with a copy of the Babel -%% system. You may however distribute the Babel system without -%% such generated files. -%% -%% The list of all files belonging to the Babel distribution is -%% given in the file `manifest.bbl'. See also `legal.bbl for additional -%% information. -%% -%% The list of derived (unpacked) files belonging to the distribution -%% and covered by LPPL is defined by the unpacking scripts (with -%% extension .ins) which are part of the distribution. -\ProvidesLanguage{ukraineb} - [2008/03/21 v1.1l Ukrainian support from the babel system] -%% File `ukraineb.dtx' -%% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams, TeXniek -%% ukraineb Language Definition File -%% Copyright (C) 1997 - 2008 -%% by Andrij Shvaika ashv at icmp.lviv.ua -%% derived from the Russianb Language Definition File -%% Copyright (C) 1995 - 2008 -%% by Olga Lapko cyrtug at mir.msk.su -%% Johannes Braams, TeXniek -%% Please report errors to: J.L. Braams -%% babel at braams.xs4all.nl +%% ---------------------------------------------------------------- +%% Ukrainian Language Support for the Babel package +%% E-mail: sergiy.ponomarenko@gmailcom +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +\NeedsTeXFormat{LaTeX2e} +\ProvidesLanguage{ukraineb}[2017/06/10 1.4 Ukrainian support for the Babel system] \LdfInit{ukrainian}{captionsukrainian} +\ifdefined\if@ukr@uni@ode + \PackageError{babel}{if@ukr@uni@ode already defined.\MessageBreak + Please contact author of ukraineb.ldf} + \relax +\fi +\newif\if@ukr@uni@ode +\ifdefined\luatexversion \@ukr@uni@odetrue \else +\ifdefined\XeTeXrevision \@ukr@uni@odetrue \fi\fi \ifx\l@ukrainian\@undefined \@nopatterns{Ukrainian} \adddialect\l@ukrainian0 \fi -\let\latinencoding\cf@encoding -\def\reserved@a#1#2{% - \edef\reserved@b{#1}% - \edef\reserved@c{#2}% - \ifx\reserved@b\reserved@c - \let\cyrillicencoding\reserved@c - \fi} -\def\cdp@elt#1#2#3#4{% - \reserved@a{#1}{OT2}% - \reserved@a{#1}{LWN}% - \reserved@a{#1}{LCY}% - \reserved@a{#1}{X2}% - \reserved@a{#1}{T2C}% - \reserved@a{#1}{T2B}% - \reserved@a{#1}{T2A}} -\cdp@list -\ifx\cyrillicencoding\undefined - \IfFileExists{ot2enc.def}{\def\cyrillicencoding{OT2}}\relax - \IfFileExists{lwnenc.def}{\def\cyrillicencoding{LWN}}\relax - \IfFileExists{lcyenc.def}{\def\cyrillicencoding{LCY}}\relax - \IfFileExists{x2enc.def}{\def\cyrillicencoding{X2}}\relax - \IfFileExists{t2cenc.def}{\def\cyrillicencoding{T2C}}\relax - \IfFileExists{t2benc.def}{\def\cyrillicencoding{T2B}}\relax - \IfFileExists{t2aenc.def}{\def\cyrillicencoding{T2A}}\relax - \ifx\cyrillicencoding\undefined - \PackageError{babel}% - {No Cyrillic encoding definition files were found}% - {Your installation is incomplete.\MessageBreak - You need at least one of the following files:\MessageBreak - \space\space - x2enc.def, t2aenc.def, t2benc.def, t2cenc.def,\MessageBreak - \space\space - lcyenc.def, lwnenc.def, ot2enc.def.}% +\def\@setcyrillicencoding{% + \def\sce@a##1##2{% + \edef\sce@b{##1}% + \edef\sce@c{##2}% + \ifx\sce@b\sce@c + \let\cyrillicencoding\sce@c + \fi}% + \def\cdp@elt##1##2##3##4{% + \sce@a{##1}{OT2}% + \sce@a{##1}{LCY}% + \sce@a{##1}{X2}% + \sce@a{##1}{T2C}% + \sce@a{##1}{T2B}% + \sce@a{##1}{T2A}% + \if@ukr@uni@ode + \sce@a{##1}{EU1}% + \sce@a{##1}{EU2}% + \fi}% + \cdp@list +} +\@setcyrillicencoding +\@onlypreamble\@setcyrillicencoding +\@onlypreamble\sce@a +\@onlypreamble\sce@b +\@onlypreamble\sce@c +\ifdefined\cyrillicencoding +\else + \if@ukr@uni@ode + \ifdefined\XeTeXrevision + \edef\cyrillicencoding{EU1} + \else\ifdefined\luatexversion + \edef\cyrillicencoding{EU2} + \fi\fi \else - \lowercase - \expandafter{\expandafter\input\cyrillicencoding enc.def\relax}% + \edef\cyrillicencoding{T2A} \fi + \PackageWarning{babel}% + {No Cyrillic font encoding has been loaded so far.\MessageBreak + A font encoding should be declared before babel.\MessageBreak + Default `\cyrillicencoding' encoding will be loaded + }% + \lowercase\expandafter{\expandafter\input\cyrillicencoding enc.def\relax}% + \AtBeginDocument{\@setcyrillicencoding} \fi -\DeclareRobustCommand{\Ukrainian}{% +\DeclareRobustCommand{\Ukrainian}{\selectlanguage{\ukrainian}} +\DeclareRobustCommand{\cyrillictext}{% \fontencoding\cyrillicencoding\selectfont \let\encodingdefault\cyrillicencoding \expandafter\set@hyphenmins\ukrainianhyphenmins \language\l@ukrainian}% -\DeclareRobustCommand{\English}{% - \fontencoding\latinencoding\selectfont - \let\encodingdefault\latinencoding - \expandafter\set@hyphenmins\englishhyphenmins - \language\l@english}% -\let\Ukr\Ukrainian -\let\Eng\English -\let\cyrillictext\Ukrainian -\let\cyr\Ukrainian +\let\cyr\cyrillictext \expandafter\ifx\csname T@X2\endcsname\relax\else - \def\@alph#1{{\fontencoding{\latinencoding}\selectfont - \ifcase#1\or - a\or b\or c\or d\or e\or f\or g\or h\or - i\or j\or k\or l\or m\or n\or o\or p\or - q\or r\or s\or t\or u\or v\or w\or x\or - y\or z\else\@ctrerr\fi}}% - \def\@Alph#1{{\fontencoding{\latinencoding}\selectfont - \ifcase#1\or - A\or B\or C\or D\or E\or F\or G\or H\or - I\or J\or K\or L\or M\or N\or O\or P\or - Q\or R\or S\or T\or U\or V\or W\or X\or - Y\or Z\else\@ctrerr\fi}}% \DeclareTextSymbolDefault{\AA}{OT1} \DeclareTextSymbolDefault{\aa}{OT1} \DeclareTextCommand{\aa}{OT1}{\r a} \DeclareTextCommand{\AA}{OT1}{\r A} \fi -\@ifpackageloaded{inputenc}{}{% - \def\reserved@a{LWN}% - \ifx\reserved@a\cyrillicencoding\else +\DeclareTextFontCommand{\textcyrillic}{\cyrillictext} +\@ifpackageloaded{inputenc}{% + \if@ukr@uni@ode + \PackageWarning{babel}{inputenc should not be used with LuaTeX or XeTeX} + \fi +}{% + %\def\reserved@a{LWN}% + %\ifx\reserved@a\cyrillicencoding\else \def\reserved@a{OT2}% \ifx\reserved@a\cyrillicencoding\else - \PackageWarning{babel}% - {No input encoding specified for Ukrainian language} - \fi\fi} -\let\lat\latintext -\DeclareTextFontCommand{\textcyrillic}{\cyrillictext} -\addto\captionsukrainian{% - \def\prefacename{{\cyr\CYRV\cyrs\cyrt\cyru\cyrp}}% - \def\refname{% - {\cyr\CYRL\cyrii\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyra}}% - \def\abstractname{% - {\cyr\CYRA\cyrn\cyro\cyrt\cyra\cyrc\cyrii\cyrya}}% - \def\bibname{% - {\cyr\CYRB\cyrii\cyrb\cyrl\cyrii\cyro\cyrgup\cyrr\cyra\cyrf\cyrii\cyrya}}% - \def\chaptername{{\cyr\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}}% - \def\appendixname{{\cyr\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}}% - \def\contentsname{{\cyr\CYRZ\cyrm\cyrii\cyrs\cyrt}}% - \def\listfigurename{{\cyr\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk - \ \cyrii\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrc\cyrii\cyrishrt}}% - \def\listtablename{{\cyr\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk - \ \cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrsftsn}}% - \def\indexname{{\cyr\CYRP\cyro\cyrk\cyra\cyrzh\cyrch\cyri\cyrk}}% - \def\authorname{{\cyr\CYRII\cyrm\cyre\cyrn\cyrn\cyri\cyrishrt - \ \cyrp\cyro\cyrk\cyra\cyrzh\cyrch\cyri\cyrk}}% - \def\figurename{{\cyr\CYRR\cyri\cyrs.}}% - \def\tablename{{\cyr\CYRT\cyra\cyrb\cyrl.}}% - \def\partname{{\cyr\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}}% - \def\enclname{{\cyr\cyrv\cyrk\cyrl\cyra\cyrd\cyrk\cyra}}% - \def\ccname{{\cyr\cyrk\cyro\cyrp\cyrii\cyrya}}% - \def\headtoname{{\cyr\CYRD\cyro}}% - \def\pagename{{\cyr\cyrs.}}% - \def\seename{{\cyr\cyrd\cyri\cyrv.}}% - \def\alsoname{{\cyr\cyrd\cyri\cyrv.\ \cyrt\cyra\cyrk\cyro\cyrzh}} - \def\proofname{{\cyr\CYRD\cyro\cyrv\cyre\cyrd\cyre\cyrn\cyrn\cyrya}}% - \def\glossaryname{{\cyr\CYRS\cyrl\cyro\cyrv\cyrn\cyri\cyrk\ % - \cyrt\cyre\cyrr\cyrm\cyrii\cyrn\cyrii\cyrv}}% - } -\def\dateukrainian{% - \def\today{\number\day~\ifcase\month\or - \cyrs\cyrii\cyrch\cyrn\cyrya\or - \cyrl\cyryu\cyrt\cyro\cyrg\cyro\or - \cyrb\cyre\cyrr\cyre\cyrz\cyrn\cyrya\or - \cyrk\cyrv\cyrii\cyrt\cyrn\cyrya\or - \cyrt\cyrr\cyra\cyrv\cyrn\cyrya\or - \cyrch\cyre\cyrr\cyrv\cyrn\cyrya\or - \cyrl\cyri\cyrp\cyrn\cyrya\or - \cyrs\cyre\cyrr\cyrp\cyrn\cyrya\or - \cyrv\cyre\cyrr\cyre\cyrs\cyrn\cyrya\or - \cyrzh\cyro\cyrv\cyrt\cyrn\cyrya\or - \cyrl\cyri\cyrs\cyrt\cyro\cyrp\cyra\cyrd\cyra\or - \cyrg\cyrr\cyru\cyrd\cyrn\cyrya\fi - \space\number\year~\cyrr.}} -\addto\extrasukrainian{\cyrillictext} -\addto\noextrasukrainian{\latintext} -\addto\extrasukrainian{\lccode`\'=`\'} -\addto\noextrasukrainian{\lccode`\'=0} + \def\reserved@a{EU1}% + \ifx\reserved@a\cyrillicencoding\else + \def\reserved@a{EU2}% + \ifx\reserved@a\cyrillicencoding\else + \PackageWarning{babel}% + {No input encoding specified for Ukrainian language} + \fi\fi\fi + %\fi +} \initiate@active@char{"} -\addto\extrasukrainian{\languageshorthands{ukrainian}} -\addto\extrasukrainian{% - \bbl@activate{"}} -\addto\noextrasukrainian{% - \bbl@deactivate{"}} \begingroup \catcode`\"12 \def\reserved@a{\endgroup \def\@SS{\mathchar"7019 } \def\dq{"}} \reserved@a -\declare@shorthand{ukrainian}{"`}{\glqq} -\declare@shorthand{ukrainian}{"'}{\grqq} -\declare@shorthand{ukrainian}{"<}{\flqq} -\declare@shorthand{ukrainian}{">}{\frqq} +\declare@shorthand{ukrainian}{"`}{\quotedblbase} +\declare@shorthand{ukrainian}{"'}{\textquotedblleft} +\declare@shorthand{ukrainian}{"<}{\guillemotleft} +\declare@shorthand{ukrainian}{">}{\guillemotright} \declare@shorthand{ukrainian}{""}{\hskip\z@skip} \declare@shorthand{ukrainian}{"~}{\textormath{\leavevmode\hbox{-}}{-}} \declare@shorthand{ukrainian}{"=}{\nobreak-\hskip\z@skip} \declare@shorthand{ukrainian}{"|}{% - \textormath{\nobreak\discretionary{-}{}{\kern.03em}% - \allowhyphens}{}} + \textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}} \declare@shorthand{ukrainian}{"-}{% \def\ukrainian@sh@tmp{% \if\ukrainian@sh@next-\expandafter\ukrainian@sh@emdash - \else\expandafter\ukrainian@sh@hyphen\fi - }% + \else\expandafter\ukrainian@sh@hyphen\fi}% \futurelet\ukrainian@sh@next\ukrainian@sh@tmp} -\def\ukrainian@sh@hyphen{% - \nobreak\-\bbl@allowhyphens} +\def\ukrainian@sh@hyphen{\nobreak\-\bbl@allowhyphens} \def\ukrainian@sh@emdash#1#2{\cdash-#1#2} \def\cdash#1#2#3{\def\tempx@{#3}% \def\tempa@{-}\def\tempb@{~}\def\tempc@{*}% @@ -228,94 +136,270 @@ \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 +\ProvideTextCommandDefault{\cyrdash}{\iflanguage{ukrainian}% + {\hbox to.8em{--\hss--}}{\textemdash}} \declare@shorthand{ukrainian}{",}{\nobreak\hskip.2em\ignorespaces} -\def\mdqon{\bbl@activate{"}} -\def\mdqoff{\bbl@deactivate{"}} -\providehyphenmins{\CurrentOption}{\tw@\tw@} -\ifx\englishhyphenmins\undefined - \def\englishhyphenmins{\tw@\thr@@} + % + % ---------------------- Caption Names --------------------------- + % +\if@ukr@uni@ode +\PackageInfo{bulgarian.ldf}{Executing the 3.9 or latter} +\StartBabelCommands*{ukrainian}{captions}[unicode, fontenc=EU1 EU2, charset=utf8] + \SetString\prefacename{ÐÑÑÑÐ¿}% [babel] + \SetString\refname{ÐÑÑÐµÑÐ°ÑÑÑÐ°}% [only article] + \SetString\abstractname{ÐÐœÐŸÑÐ°ÑÑÑ}% [only article, report] + \SetString\bibname{ÐÑÐ±Ð»ÑÐŸÒÑÐ°ÑÑÑ}% [only book, report] + \SetString\chaptername{Ð ÐŸÐ·ÐŽÑÐ»}% [only book, report] + \SetString\appendixname{ÐÐŸÐŽÐ°ÑÐŸÐº}% + \SetString\contentsname{ÐÐŒÑÑÑ}% + \SetString\tocname{\contentsname}% + \SetString\listfigurename{ÐÐµÑÐµÐ»ÑÐº ÑÐ»ÑÑÑÑÐ°ÑÑÐ¹}% + \SetString\listtablename{ÐÐµÑÐµÐ»ÑÐº ÑÐ°Ð±Ð»ÐžÑÑ}% + \SetString\indexname{ÐÑÐµÐŽÐŒÐµÑÐœÐžÐ¹ Ð¿ÐŸÐºÐ°Ð¶ÑÐžÐº}% + \SetString\authorname{ÐÐŒÐµÐœÐœÐžÐ¹ Ð¿ÐŸÐºÐ°Ð¶ÑÐžÐº}% + \SetString\figurename{Ð ÐžÑ.}% + \SetString\tablename{Ð¢Ð°Ð±Ð»ÐžÑÑ}% + \SetString\partname{Ð§Ð°ÑÑÐžÐœÐ°}% + \SetString\enclname{Ð²ÐºÐ».}% + \SetString\ccname{Ð²ÐžÑ.}% + \SetString\headtoname{Ð²Ñ.}% + \SetString\pagename{Ñ.}% [letter] + \SetString\seename{ÐŽÐžÐ².}% + \SetString\alsoname{ÐŽÐžÐ².\ ÑÐ°ÐºÐŸÐ¶}% + \SetString\proofname{ÐÐŸÐ²ÐµÐŽÐµÐœÐœÑ}% [amsthm] + \SetString\glossaryname{Ð¡Ð»ÐŸÐ²ÐœÐžÐº ÑÐµÑÐŒÑÐœÑÐ²}% + \SetString\acronymname{ÐÐ±ÑÐµÐ²ÑÐ°ÑÑÑÐž}% [glossaries] {Acronyms} + \SetString\lstlistingname{ÐÑÑÑÐžÐœÐ³}% [listings] (the environment) {Listing} + \SetString\lstlistlistingname{ÐÑÑÑÐžÐœÐ³Ðž}% [listings] (the "List of") {Listings} + \SetString\nomname{ÐÐŸÐ·ÐœÐ°ÑÐµÐœÐœÑ} + \SetString\notesname{ÐÐŸÑÐ°ÑÐºÐž}% [endnotes] {Notes} + % + % ------------------------- nomencl ------------------------------ + % + \ifdefined\nomname% + \addto\captionsukrainian{% + \def\eqdeclaration#1{, ÐŽÐžÐ².\nobreakspace(#1)}% + \def\pagedeclaration#1{, ÑÑÐŸÑ.\nobreakspace#1}% + }% + \fi + % + % ------------------- RevTeX4 & RevTeX4-1 ------------------------ + % + %\@ifclassloaded{revtex4-1} + %{<true code>} + %{<false coode>}% + % + \ifnum\@ifclassloaded{revtex4}{1}{\@ifclassloaded{revtex4-1}{1}{0}}>0 + \SetString\lofname{\listfigurename} + \SetString\lotname{\listtablename} + \SetString\figuresname{Ð ÐžÑÑÐœÐºÐž} + \SetString\tablesname{Ð¢Ð°Ð±Ð»ÐžÑÑ} + \SetString\appendixesname{ÐÐŸÐŽÐ°ÑÐºÐž} + \SetString\acknowledgmentsname{ÐÐŸÐŽÑÐºÐž} + \SetString\andname{ÑÐ°}%{and} + \SetString\@pacs@name{PACS ÐºÐŸÐŽÐž: } + \SetString\@keys@name{ÐÐ»ÑÑÐŸÐ²Ñ ÑÐ»ÐŸÐ²Ð°: } + \SetString\Dated@name{ÐÐ°ÑÐ°: } + \SetString\Received@name{ÐÑÑÐžÐŒÐ°ÐœÐŸ } + \SetString\Revised@name{ÐÐžÐ¿ÑÐ°Ð²Ð»ÐµÐœÐ° Ð²ÐµÑÑÑÑ } + \SetString\Accepted@name{ÐÑÐžÐ¹ÐœÑÑÐŸ } + \SetString\Published@name{ÐÐ¿ÑÐ±Ð»ÑÐºÐŸÐ²Ð°ÐœÐŸ } + %}{}% + \fi + \EndBabelCommands +\else +\StartBabelCommands*{ukrainian}{captions} + \SetString\prefacename{{\cyr\CYRV\cyrs\cyrt\cyru\cyrp}}% + \SetString\refname{% + {\cyr\CYRL\cyrii\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyra}}% + \SetString\abstractname{% + {\cyr\CYRA\cyrn\cyro\cyrt\cyra\cyrc\cyrii\cyrya}}% + \SetString\bibname{% + {\cyr\CYRB\cyrii\cyrb\cyrl\cyrii\cyro\cyrgup\cyrr\cyra\cyrf\cyrii\cyrya}}% + \SetString\chaptername{{\cyr\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}}% + \SetString\appendixname{{\cyr\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}}% + \SetString\contentsname{{\cyr\CYRZ\cyrm\cyrii\cyrs\cyrt}}% + \SetString\tocname{\contentsname} + \SetString\listfigurename{{\cyr\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk + \ \cyrii\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrc\cyrii\cyrishrt}}% + \SetString\listtablename{{\cyr\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk + \ \cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrsftsn}}% + \SetString\indexname{{\cyr\CYRP\cyrr\cyre\cyrd\cyrm\cyre\cyrt\cyrn\cyri\cyrishrt + \ \cyrp\cyro\cyrk\cyra\cyrzh\cyrch\cyri\cyrk}}% + \SetString\authorname{{\cyr\CYRII\cyrm\cyre\cyrn\cyrn\cyri\cyrishrt + \ \cyrp\cyro\cyrk\cyra\cyrzh\cyrch\cyri\cyrk}}% + \SetString\figurename{{\cyr\CYRR\cyri\cyrs.}}% + \SetString\tablename{{\cyr\CYRT\cyra\cyrb\cyrl.}}% + \SetString\partname{{\cyr\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}}% + \SetString\enclname{{\cyr\cyrv\cyrk\cyrl\cyra\cyrd\cyrk\cyra}}% + \SetString\ccname{{\cyr\cyrk\cyro\cyrp\cyrii\cyrya}}% + \SetString\headtoname{{\cyr\cyrv\cyrh.}}% + \SetString\pagename{{\cyr\cyrs.}}% + \SetString\seename{{\cyr\cyrd\cyri\cyrv.}}% + \SetString\alsoname{{\cyr\cyrd\cyri\cyrv.\ \cyrt\cyra\cyrk\cyro\cyrzh}} + \SetString\proofname{{\cyr\CYRD\cyro\cyrv\cyre\cyrd\cyre\cyrn\cyrn\cyrya}}% + \SetString\glossaryname{{\cyr\CYRS\cyrl\cyro\cyrv\cyrn\cyri\cyrk + \ \cyrt\cyre\cyrr\cyrm\cyrii\cyrn\cyrii\cyrv}}% + \SetString\nomname{\CYRP\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}% + \SetString\notesname{\CYRN\cyro\cyrt\cyra\cyrt\cyrk\cyri}% + % + % ------------------- RevTeX4 & RevTeX4-1 ------------------------ + % + \ifnum \@ifclassloaded{revtex4}{1}{\@ifclassloaded{revtex4-1}{1}{0}}>0 + \SetString\lofname{\listfigurename} + \SetString\lotname{\listtablename} + \SetString\figuresname{\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri} + \SetString\tablesname{\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii} + \SetString\appendixesname{\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri} + \SetString\acknowledgmentsname{\CYRP\cyro\cyrd\cyrya\cyrk\cyri} + \SetString\andname{\cyrt\cyra}%{and} + \SetString\@pacs@name{PACS \cyrk\cyro\cyrd\cyri: } + \SetString\@keys@name{\CYRK\cyrl\cyryu\cyrch\cyro\cyrv\cyrii + \ \cyrs\cyrl\cyro\cyrv\cyra: } + \SetString\Dated@name{\CYRD\cyra\cyrt\cyra: } + \SetString\Received@name{\CYRO\cyrt\cyrr\cyri\cyrm\cyra\cyrn\cyro } + \SetString\Revised@name{\CYRV\cyri\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyro } + \SetString\Accepted@name{\CYRP\cyrr\cyri\cyrishrt\cyrn\cyrya\cyrt\cyro }% + \SetString\Published@name{\CYRO\cyrp\cyru\cyrb\cyrl\cyrii\cyrk\cyro\cyrv\cyra\cyrn\cyro } + \fi + \EndBabelCommands \fi + % + % ---------------------- Date --------------------------- + % +\if@ukr@uni@ode +\PackageInfo{bulgarian.ldf}{Executing the post 3.9 branch for dates} +\StartBabelCommands*{ukrainian}{date}[unicode, fontenc=EU1 EU2, charset=utf8] +\SetStringLoop{month#1name}{% +ÑÑÑÐœÑ,Ð»ÑÑÐŸÐ³ÐŸ,Ð±ÐµÑÐµÐ·ÐœÑ,ÐºÐ²ÑÑÐœÑ,ÑÑÐ°Ð²ÐœÑ,ÑÐµÑÐ²ÐœÑ,% +Ð»ÐžÐ¿ÐœÑ,ÑÐµÑÐ¿ÐœÑ,Ð²ÐµÑÐµÑÐœÑ,Ð¶ÐŸÐ²ÑÐœÑ,Ð»ÐžÑÑÐŸÐ¿Ð°ÐŽÐ°,Ð³ÑÑÐŽÐœÑ} + +\SetStringLoop{weekday#1name}{% +Ð¿ÐŸÐœÐµÐŽÑÐ»ÐŸÐº,Ð²ÑÐ²ÑÐŸÑÐŸÐº,ÑÐµÑÐµÐŽÐ°,ÑÐµÑÐ²ÐµÑ,Ð¿'ÑÑÐœÐžÑÑ,ÑÑÐ±ÐŸÑÐ°,ÐœÐµÐŽÑÐ»Ñ} + +\SetString\abbgyear{Ñ.} +\else +\StartBabelCommands*{ukrainian}{date} +\SetStringLoop{month#1name}{% +\cyrs\cyrii\cyrch\cyrn\cyrya,% +\cyrl\cyryu\cyrt\cyro\cyrg\cyro,% +\cyrb\cyre\cyrr\cyre\cyrz\cyrn\cyrya,% +\cyrk\cyrv\cyrii\cyrt\cyrn\cyrya,% +\cyrt\cyrr\cyra\cyrv\cyrn\cyrya,% +\cyrch\cyre\cyrr\cyrv\cyrn\cyrya,% +\cyrl\cyri\cyrp\cyrn\cyrya,% +\cyrs\cyre\cyrr\cyrp\cyrn\cyrya,% +\cyrv\cyre\cyrr\cyre\cyrs\cyrn\cyrya,% +\cyrzh\cyro\cyrv\cyrt\cyrn\cyrya,% +\cyrl\cyri\cyrs\cyrt\cyro\cyrp\cyra\cyrd\cyra,% +\cyrg\cyrr\cyru\cyrd\cyrn\cyrya% +}% +\SetString\abbgyear{\cyrr.} +\fi +\SetString\today{\number\day\,\csname month\romannumeral\month name\endcsname\space +\number\year\,\abbgyear} +\EndBabelCommands +\providehyphenmins{\CurrentOption}{\tw@\tw@} +\providehyphenmins{ukrainian}{\tw@\tw@} +\addto\extrasukrainian{\cyrillictext} +\addto\noextrasukrainian{\latintext} +\addto\extrasukrainian{\languageshorthands{ukrainian}} +\addto\extrasukrainian{\bbl@activate{"}} +\addto\noextrasukrainian{\bbl@deactivate{"}} \addto\extrasukrainian{\bbl@frenchspacing} \addto\noextrasukrainian{\bbl@nonfrenchspacing} -\def\Asbuk#1{\expandafter\@Asbuk\csname c@#1\endcsname} -\def\@Asbuk#1{\ifcase#1\or - \CYRA\or\CYRB\or\CYRV\or\CYRG\or\CYRD\or\CYRE\or\CYRIE\or - \CYRZH\or\CYRZ\or\CYRI\or\CYRII\or\CYRYI\or\CYRISHRT\or - \CYRK\or\CYRL\or\CYRM\or\CYRN\or\CYRO\or\CYRP\or\CYRR\or - \CYRS\or\CYRT\or\CYRU\or\CYRF\or\CYRH\or\CYRC\or\CYRCH\or - \CYRSH\or\CYRSHCH\or\CYRYU\or\CYRYA\else\@ctrerr\fi} -\def\asbuk#1{\expandafter\@asbuk\csname c@#1\endcsname} -\def\@asbuk#1{\ifcase#1\or - \cyra\or\cyrb\or\cyrv\or\cyrg\or\cyrd\or\cyre\or\cyrie\or - \cyrzh\or\cyrz\or\cyri\or\cyrii\or\cyryi\or\cyrishrt\or - \cyrk\or\cyrl\or\cyrm\or\cyrn\or\cyro\or\cyrp\or\cyrr\or - \cyrs\or\cyrt\or\cyru\or\cyrf\or\cyrh\or\cyrc\or\cyrch\or - \cyrsh\or\cyrshch\or\cyryu\or\cyrya\else\@ctrerr\fi} -\@ifundefined{sym\cyrillicencoding letters}{}{% -\SetSymbolFont{\cyrillicencoding letters}{bold}\cyrillicencoding - \rmdefault\bfdefault\updefault -\DeclareSymbolFontAlphabet\cyrmathrm{\cyrillicencoding letters} -\DeclareMathAlphabet\cyrmathbf\cyrillicencoding - \rmdefault\bfdefault\updefault -\DeclareMathAlphabet\cyrmathsf\cyrillicencoding - \sfdefault\mddefault\updefault -\DeclareMathAlphabet\cyrmathit\cyrillicencoding - \rmdefault\mddefault\itdefault -\DeclareMathAlphabet\cyrmathtt\cyrillicencoding - \ttdefault\mddefault\updefault -\SetMathAlphabet\cyrmathsf{bold}\cyrillicencoding - \sfdefault\bfdefault\updefault -\SetMathAlphabet\cyrmathit{bold}\cyrillicencoding - \rmdefault\bfdefault\itdefault + +\addto\extrasukrainian{ +\babel@save{\@Alph} +\if@ukr@uni@ode + \def\@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 Ð¯\else\@ctrerr\fi} +\else + \def\@Alph#1{\ifcase#1\or + \CYRA\or\CYRB\or\CYRV\or\CYRG\or\CYRD\or\CYRE\or\CYRZH\or + \CYRI\or\CYRK\or\CYRL\or\CYRM\or\CYRN\or\CYRP\or\CYRR\or + \CYRS\or\CYRT\or\CYRU\or\CYRF\or\CYRH\or\CYRC\or\CYRSH\or + \CYRSHCH\or\CYRYU\or\CYRYA\else\@ctrerr\fi} +\fi } +\addto\extrasukrainian{ +\babel@save{\@alph} +\if@ukr@uni@ode + \def\@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 Ñ\else\@ctrerr\fi} +\else + \def\@alph#1{\ifcase#1\or + \cyra\or\cyrb\or\cyrv\or\cyrg\or\cyrd\or\cyre\or\cyrzh\or + \cyri\or\cyrk\or\cyrl\or\cyrm\or\cyrn\or\cyrp\or\cyrr\or + \cyrs\or\cyrt\or\cyru\or\cyrf\or\cyrh\or\cyrc\or\cyrsh\or + \cyrshch\or\cyryu\or\cyrya\else\@ctrerr\fi} +\fi +} +\DeclareRobustCommand{\No}{% + \ifmmode{\nfss@text{\textnumero}}\else\textnumero\fi} \def\sh{\mathop{\operator@font sh}\nolimits} \def\ch{\mathop{\operator@font ch}\nolimits} \def\tg{\mathop{\operator@font tg}\nolimits} +\def\ctg{\mathop{\operator@font ctg}\nolimits} \def\arctg{\mathop{\operator@font arctg}\nolimits} \def\arcctg{\mathop{\operator@font arcctg}\nolimits} -\addto\extrasrussian{% +\addto\extrasukrainian{% \babel@save{\th}% \let\ltx@th\th \def\th{\textormath{\ltx@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\nsd{\mathop{\cyrmathrm{\cyrn.\cyrs.\cyrd.}}\nolimits} -\def\nsk{\mathop{\cyrmathrm{\cyrn.\cyrs.\cyrk.}}\nolimits} -\def\NSD{\mathop{\cyrmathrm{\CYRN\CYRS\CYRD}}\nolimits} -\def\NSK{\mathop{\cyrmathrm{\CYRN\CYRS\CYRK}}\nolimits} - \def\nod{\mathop{\cyrmathrm{\cyrn.\cyro.\cyrd.}}\nolimits} % ?????? - \def\nok{\mathop{\cyrmathrm{\cyrn.\cyro.\cyrk.}}\nolimits} % ?????? - \def\NOD{\mathop{\cyrmathrm{\CYRN\CYRO\CYRD}}\nolimits} % ?????? - \def\NOK{\mathop{\cyrmathrm{\CYRN\CYRO\CYRK}}\nolimits} % ?????? -\def\Proj{\mathop{\cyrmathrm{\CYRP\cyrr}}\nolimits} -\DeclareRobustCommand{\No}{% - \ifmmode{\nfss@text{\textnumero}}\else\textnumero\fi} \ldf@finish{ukrainian} %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z %% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren $ Right paren $ -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} %% -\endinput + +%% ---------------------------------------------------------------- +%% Copyright 2017 Sergiy Ð. Ponomarenko +%% Copyright 2011-2017 Igor A. Kotelnikov. +%% Copyright 2000 Aleksey Novodvorsky +%% Copyright 1995-2008 Olga Lapko. +%% Copyright 1989-2012 Johannes L. Braams. +%% +%% This file is a part of the Ukrainian-Babel package. +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% The package is "maintained" (as per LPPL maintenance status) by +%% Sergiy Ð. Ponomarenko. +%% +%% The package consists of the file ukraineb.dtx +%% and the derived files ukraineb.ins, +%% ukraineb.ldf, +%% ukraineb.pdf, +%% README. +%% ---------------------------------------------------------------- %% %% End of file `ukraineb.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-ukrainian.tlpobj new/tlpkg/tlpobj/babel-ukrainian.tlpobj --- old/tlpkg/tlpobj/babel-ukrainian.tlpobj 2016-04-25 03:14:21.000000000 +0200 +++ new/tlpkg/tlpobj/babel-ukrainian.tlpobj 2017-06-11 02:21:20.000000000 +0200 @@ -1,13 +1,15 @@ name babel-ukrainian category Package -revision 40730 +revision 44550 shortdesc Babel support for Ukrainian relocated 1 -longdesc The package supports babel typesetting in the context of babel. +longdesc The package provides support for use of babel in documents +longdesc written in Ukrainian. The support is adapted for use under +longdesc legacy TeX engines as well as XeTeX and LuaTeX. runfiles size=4 RELOC/tex/generic/babel-ukrainian/ukraineb.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/ukrainian -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl1.3 +catalogue-date 2017-06-10 14:00:07 +0200 +catalogue-license lppl1.3c catalogue-topics multilingual-addon ukrainian -catalogue-version 1.1l +catalogue-version 1.4 ++++++ babel-vietnamese.doc.tar.xz ++++++ ++++++ babel-vietnamese.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-vietnamese.tlpobj new/tlpkg/tlpobj/babel-vietnamese.tlpobj --- old/tlpkg/tlpobj/babel-vietnamese.tlpobj 2016-04-14 18:38:19.000000000 +0200 +++ new/tlpkg/tlpobj/babel-vietnamese.tlpobj 2017-04-14 17:29:34.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/generic/babel-vietnamese/vietnamese.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/vietnamese -catalogue-date 2015-12-31 12:55:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics vietnamese multilingual-addon catalogue-version 1.4 ++++++ babel-welsh.doc.tar.xz ++++++ ++++++ babel-welsh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-welsh.tlpobj new/tlpkg/tlpobj/babel-welsh.tlpobj --- old/tlpkg/tlpobj/babel-welsh.tlpobj 2016-04-14 18:38:19.000000000 +0200 +++ new/tlpkg/tlpobj/babel-welsh.tlpobj 2017-04-14 17:29:34.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/babel-welsh/welsh.ldf catalogue-ctan /macros/latex/contrib/babel-contrib/welsh -catalogue-date 2015-09-04 20:16:13 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics welsh multilingual-addon catalogue-version 1.1a ++++++ babel.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/babel/README new/doc/latex/babel/README --- old/doc/latex/babel/README 2016-04-23 23:51:09.000000000 +0200 +++ new/doc/latex/babel/README 2017-05-19 23:04:34.000000000 +0200 @@ -1,30 +1,41 @@ -Babel 3.9r +Babel 3.10 ---------- -This is Babel 3.9r. - -*** Babel 3.9o and 3.9p are deprecated *** -*** For incompatibilities with polyglossia read the manual *** -*** You must recreate the formats if coming from an older version *** +This package manages culturally-determined typographical (and other) +rules, and hyphenation patterns for a wide range of languages. Many +language styles work with pdflatex, as well as with xelatex and +lualatex out of the box. A few even work with plain formats. Version 3.9a fixed lots of bugs and added some new features, intended mainly to make it compatible somehow with Unicode engines. Some bugs have not been fixed to avoid backward incompatibilities, but they have -been documented. Most of the new features (like package options) are +been documented. Most of the new features (like package options) were intended to overcome issues in previous releases without changing significantly the behaviour of Babel. +Current development is focused on Unicode engines (XeTeX and LuaTeX). +New features related to font selection, bidi writing and the like will +be added incrementally. Versions numbers drop the letter and now 3.10, +3.11, etc., will be used instead. So, 3.9t is the last in the former +series. + +Included is a pre-release of the new ini files (for about 200 +languages) to be used in forthcoming versions. They are currenly not +used, but this way they can be fine-tuned before the final release +(they are based mainly on the CLDR, and some settings are not well +suited for fine typesetting). + Languages are not part of the Babel core any more; in particular, it shall be no longer necessary to synchronize Babel core releases with releases of Babel language files. See CONTRIB for further details -about contributing a language. +about contributing a language. You may also create an ini file or +improve the existing ones -- it's a trivial task (no programming +skills required at all), but don't hesitate to ask for help. -To install it, just tex babel.ins and move the generated files to the -corresponding place in your TeX distribution. Unlike former releases, -formats must not be recreated, but it is recommended, at least the -first time Babel is updated from 3.8 (or previous versions). +The best way to install and/or update it is with the help of package +managers. -Changes are described in babel.pdf with the label "New 3.9". The +Changes are described in babel.pdf with the label "New <version>". The manual has been expanded to include some tips and tricks, but it will be improved in next releases. @@ -39,88 +50,32 @@ Bugs related to specific languages are best reported to their respective authors. -Versions >=3.9i presumes the german style has been updated to 2.7. +Recent changes +-------------- + +3.10 - New versioning + - New macro - \babelprovide + +3.9t - Part of the code for 3.10 ss has been "back-ported" to this + release, but they are only internal changes. + - Fix - with \babelhyphen{soft} the hyphen could vanish. + - English, Indonesian and Malay "dialects" now rely on the proxy + files provided by these languages (eg, american.ldf, melayu.ldf). + If you upgrade babel, you MUST upgrade those languages, too. + +3.9s - Bug fix - extra spaces with \babelensure -New ---- -* babel.dtx -3.9b - Fixed an idiot slip in hyphen.cfg: a \def instead of \let -3.9c - Added the "modifiers" mechanism - - Option shorthands accepts t for ~ and c for , - - \foreinglanguage inserted a par (because of an empty line - in the doc part) -3.9d - Fixed undefined \@expandtwoargs in Plain - - Code reorganized (just an "internal" change) -3.9e - Fixed a bug introduced in 3.9c which mangled key=value - options. -3.9f - Default hyphenmins were not set to 2 3. Now they are again. -3.9g - bbplain.dtx and babel.dtx merged. - - The number of languages was not printed in some formats. - - A new mechanism to force \StartBabelCommands even without the - 'strings' key (\UseStrings didn't work at all). - - With \AfterBabelCommands macros can be defined in the global scope. - - A tool for readjusting lccodes for hyphenation (\SetHyphenMap and a - package option). - - Tentative macros for \fontspec. -3.9h - Fixed bugs in \SetStringLoop (first token expanded prematurely) - and \SetCase (sometimes ignored). - - bplain didn't work (again). Fixed. - - Other minor internal changes. -3.9i - With LuaTeX, spaces are not ignored after shorthands and closing - braces can follow them. - - \textlatin and friends are deprecated. For the logos (see - below) a new macro is used if necessary (\ensureascii), so - \textlatin is not used in the core any more. - - \babelensure can be used to wrap caption texts with \foreignlanguage, - as well as to enforce an encoding. - - \babeltags is just for syntactical sugar, and defines macros - with short names to switch the language (eg, \textdeu and \deu). - - Partial compatibility with languages named as \lang@ instead - of \l@ (plain etex/xetex/luatex). - - Bug fix. The logos \TeX and \LaTeX were typeset in a wrong font - in some cases. Now if a non-ASCII font is not loaded they are not - redefined at all. - - Bug fix. \bbl@allowhyphens is now ignored in vertical mode. - - Bug fix. Loops with \@for failed in Plain. - - Bug fix. A few codes in xetex where wrong when loading patterns. - - Bug fix. With strings=encoded captions were left unchanged in - \MakeUppercase/\MakeLowercase. -3.9j - Bug fix. Plain formats didn't work (Undefined \@filelist). -3.9k - Code and doc reorganized with some `literate' concepts (with a - slightly patched docstrip). - - Removed the luatex stuff for shorthands. It was just a first step, - but ended up in the final release of 3.9i (it shouldn't). - - Improvements for Plain and other non-LaTeX formats. -3.9l - Formerly, fontspec set \latinencoding to EUx if babel was loaded. - Now, babel sets it if fontspec is loaded. - - New package options 'nocase' (\SetCase is ignored) and 'silent' - - Improved compatibility (hopefully) with babelbib. -3.9m - Fixed melayu name (from meyalu). - - A few lines for \babelpatterns (only luatex, see below). -3.9n - Just fixes a couple of minor bugs (related to 2.09 and ifthen). -3.9o - Adapted to the forthcoming Unicode encoding. -3.9p - A little change for bbunicode 1.1b. -3.9q - base now reads patterns in lua - - Some minor changes for luatex 3.9r - The three main dtx files now share version numbers. - bbunicode - Fixed a line break at \cs{foreignlanguage} with unloaded patterns. Also added \babelcatcodetablenum, just in case. + +3.9q - base now reads patterns in lua + - Some minor changes for luatex -* bbunicode.dtx -1.0b - Improvements by Elie Roux for LuaTeX. -1.0c - Bug fix. A few codes in xetex where wrong when loading patterns. -1.0e - \babelpatterns, which adds patterns to a language. - - Use [[]] instead of \luaescapestring (the latter is not always - available). -1.0f - Code for luatex assigned mistakenly to xetex. -1.1a - Revamped hyphenation loader for luatex. -1.1b - Now patterns are loaded with lua(e)tex (and a bug fixed). -1.1c - Patterns loader thorougly revised -3.9r and later - The three main dtx files now share version numbers. See - changes above +*** Babel 3.9o and 3.9p are deprecated *** ------------ Javier Bezos -2016-04-23 +2017-05-19 Binary files old/doc/latex/babel/babel.pdf and new/doc/latex/babel/babel.pdf differ Binary files old/doc/latex/babel/locale.zip and new/doc/latex/babel/locale.zip differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel.doc.tlpobj new/tlpkg/tlpobj/babel.doc.tlpobj --- old/tlpkg/tlpobj/babel.doc.tlpobj 2016-04-24 03:15:11.000000000 +0200 +++ new/tlpkg/tlpobj/babel.doc.tlpobj 2017-05-19 23:41:34.000000000 +0200 @@ -1,10 +1,11 @@ name babel.doc category Package -revision 40706 +revision 44427 shortdesc doc files of babel relocated 1 -docfiles size=102 +docfiles size=271 RELOC/doc/latex/babel/CONTRIB RELOC/doc/latex/babel/FIXES39 RELOC/doc/latex/babel/README RELOC/doc/latex/babel/babel.pdf + RELOC/doc/latex/babel/locale.zip ++++++ babel.tar.xz ++++++ ++++ 2297 lines of diff (skipped) ++++++ babelbib.doc.tar.xz ++++++ ++++++ babelbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babelbib.tlpobj new/tlpkg/tlpobj/babelbib.tlpobj --- old/tlpkg/tlpobj/babelbib.tlpobj 2016-04-14 18:38:21.000000000 +0200 +++ new/tlpkg/tlpobj/babelbib.tlpobj 2017-04-14 17:29:34.000000000 +0200 @@ -53,7 +53,7 @@ RELOC/tex/latex/babelbib/spanish.bdf RELOC/tex/latex/babelbib/swedish.bdf catalogue-ctan /biblio/bibtex/contrib/babelbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics bibtex-sty multilingual catalogue-version 1.31 ++++++ background.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/background.doc.tlpobj new/tlpkg/tlpobj/background.doc.tlpobj --- old/tlpkg/tlpobj/background.doc.tlpobj 2016-04-14 18:38:21.000000000 +0200 +++ new/tlpkg/tlpobj/background.doc.tlpobj 2017-04-14 17:29:34.000000000 +0200 @@ -1,6 +1,6 @@ name background.doc category Package -revision 33100 +revision 42428 shortdesc doc files of background relocated 1 docfiles size=30 ++++++ background.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/background.tlpobj new/tlpkg/tlpobj/background.tlpobj --- old/tlpkg/tlpobj/background.tlpobj 2016-04-14 18:38:21.000000000 +0200 +++ new/tlpkg/tlpobj/background.tlpobj 2017-04-14 17:29:35.000000000 +0200 @@ -1,6 +1,6 @@ name background category Package -revision 33100 +revision 42428 shortdesc Placement of background material on pages of a document relocated 1 longdesc The package offers the placement of background material on the @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/background/background.sty catalogue-ctan /macros/latex/contrib/background -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics background decoration catalogue-version 2.1 ++++++ backnaur.doc.tar.xz ++++++ ++++++ backnaur.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/backnaur.tlpobj new/tlpkg/tlpobj/backnaur.tlpobj --- old/tlpkg/tlpobj/backnaur.tlpobj 2016-04-14 18:38:22.000000000 +0200 +++ new/tlpkg/tlpobj/backnaur.tlpobj 2017-04-14 17:29:35.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/backnaur/backnaur.sty catalogue-ctan /macros/latex/contrib/backnaur -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics formal-spec catalogue-version 1.1 ++++++ bagpipe.doc.tar.xz ++++++ ++++++ bagpipe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bagpipe.tlpobj new/tlpkg/tlpobj/bagpipe.tlpobj --- old/tlpkg/tlpobj/bagpipe.tlpobj 2016-04-14 18:38:22.000000000 +0200 +++ new/tlpkg/tlpobj/bagpipe.tlpobj 2017-04-14 17:29:45.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/bagpipe/bagpipe.tex RELOC/tex/generic/bagpipe/bagpipex.ini catalogue-ctan /macros/generic/bagpipe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics music catalogue-version 3.02 ++++++ bangorcsthesis.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bangorcsthesis/README new/doc/latex/bangorcsthesis/README --- old/doc/latex/bangorcsthesis/README 2016-01-21 23:21:12.000000000 +0100 +++ new/doc/latex/bangorcsthesis/README 2016-11-25 19:28:07.000000000 +0100 @@ -1,6 +1,6 @@ Bangor University Computer Science Department Thesis Document Class -Cameron Gray <c.gray(a)bangor.ac.uk> January 20, 2016 +Cameron Gray <c.gray(a)bangor.ac.uk> August 24, 2016 Abstract Binary files old/doc/latex/bangorcsthesis/bangorcsthesis.pdf and new/doc/latex/bangorcsthesis/bangorcsthesis.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bangorcsthesis.doc.tlpobj new/tlpkg/tlpobj/bangorcsthesis.doc.tlpobj --- old/tlpkg/tlpobj/bangorcsthesis.doc.tlpobj 2016-04-14 18:38:22.000000000 +0200 +++ new/tlpkg/tlpobj/bangorcsthesis.doc.tlpobj 2017-04-14 17:29:45.000000000 +0200 @@ -1,6 +1,6 @@ name bangorcsthesis.doc category Package -revision 39451 +revision 41919 shortdesc doc files of bangorcsthesis relocated 1 docfiles size=72 ++++++ bangorcsthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bangorcsthesis/bangorcsthesis.cls new/tex/latex/bangorcsthesis/bangorcsthesis.cls --- old/tex/latex/bangorcsthesis/bangorcsthesis.cls 2016-01-21 23:21:12.000000000 +0100 +++ new/tex/latex/bangorcsthesis/bangorcsthesis.cls 2016-11-25 19:33:41.000000000 +0100 @@ -7,7 +7,7 @@ %% bangorcsthesis.dtx (with options: `bangorcsthesis.cls,package') %% %% bangorcsthesis.dtx -%% Copyright 2014-15 Cameron Gray/Bangor University <c.gray(a)bangor.ac.uk> +%% Copyright 2014-16 Cameron Gray/Bangor University <c.gray(a)bangor.ac.uk> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -45,11 +45,11 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\def\version{1.5.0} +\def\version{1.5.1} \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{bangorcsthesis}[2016/01/20 \version C. Gray] +\ProvidesClass{bangorcsthesis}[2016/08/24 \version C. Gray] \def\degreeScheme#1{\def\@scheme{#1}} @@ -120,8 +120,10 @@ \setboolean{@sansserifheadings}{true} \DeclareOption{serifheadings}{\setboolean{@sansserifheadings}{false}} +\setboolean{@twoside}{false} \DeclareOption{twoside}{ \PassOptionsToClass{\CurrentOption}{report} +\setboolean{@twoside}{true} } \ProcessOptions\relax @@ -167,7 +169,7 @@ \newcommand{\tgherosfontfoot}{\fontfamily{bch}\selectfont} } -\RequirePackage{graphicx,url,csquotes,fixltx2e,microtype,setspace,fancyhdr,enumitem,amsmath} +\RequirePackage{graphicx,url,csquotes,microtype,setspace,fancyhdr,enumitem,amsmath} \RequirePackage[hidelinks,bookmarks=true,colorlinks=false]{hyperref} \RequirePackage[nameinlink,capitalize]{cleveref} @@ -271,6 +273,7 @@ \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} + \ifthenelse{\boolean{@twoside}}{ \fancyfootoffset[RO]{1.75cm} \fancyfoot[RO]{% \tgherosfontfoot\footnotesize% @@ -282,6 +285,13 @@ \tgherosfontfoot\footnotesize% \makebox[1.4cm][l]{\textbf{\thepage}}\hspace*{9pt} } +}{ + \fancyfootoffset[R]{1.75cm} + \fancyfoot[R]{% + \tgherosfontfoot\footnotesize% + \hspace*{9pt}\makebox[1.4cm][l]{\textbf{\thepage}}% + } +} } \fancypagestyle{maincontentstyle} { @@ -290,6 +300,7 @@ \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} + \ifthenelse{\boolean{@twoside}}{ \fancyfootoffset[RO]{1.75cm} \fancyfoot[RO]{% \tgherosfontfoot\footnotesize% @@ -301,6 +312,13 @@ \tgherosfontfoot\footnotesize% \makebox[1.4cm][l]{\textbf{\thepage}}\hspace*{9pt}\rightmark } +}{ +\fancyfootoffset[RO]{1.75cm} + \fancyfoot[R]{% + \tgherosfontfoot\footnotesize% + \leftmark\hspace*{9pt}\makebox[1.4cm][l]{\textbf{\thepage}}% + } +} } \ifthenelse{\boolean{@centredcaptions}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bangorcsthesis.tlpobj new/tlpkg/tlpobj/bangorcsthesis.tlpobj --- old/tlpkg/tlpobj/bangorcsthesis.tlpobj 2016-04-14 18:38:23.000000000 +0200 +++ new/tlpkg/tlpobj/bangorcsthesis.tlpobj 2017-04-14 17:29:45.000000000 +0200 @@ -1,6 +1,6 @@ name bangorcsthesis category Package -revision 39451 +revision 41919 shortdesc Typeset a thesis at Bangor University relocated 1 longdesc The class typesets thesis/dissertation documents for all levels @@ -10,7 +10,7 @@ runfiles size=61 RELOC/tex/latex/bangorcsthesis/bangorcsthesis.cls catalogue-ctan /macros/latex/contrib/bangorcsthesis -catalogue-date 2016-01-21 07:08:46 +0100 +catalogue-date 2016-08-24 10:25:48 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class -catalogue-version 1.5.0 +catalogue-version 1.5.1 ++++++ bangtex.doc.tar.xz ++++++ ++++++ bangtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bangtex.tlpobj new/tlpkg/tlpobj/bangtex.tlpobj --- old/tlpkg/tlpobj/bangtex.tlpobj 2016-04-14 18:38:23.000000000 +0200 +++ new/tlpkg/tlpobj/bangtex.tlpobj 2017-04-14 17:29:46.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/tex/latex/bangtex/bsize10.clo RELOC/tex/latex/bangtex/bsize11.clo RELOC/tex/latex/bangtex/bsize12.clo -catalogue-ctan /language/bangtex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-ctan /language/bengali/bangtex +catalogue-date 2016-10-21 08:37:47 +0200 catalogue-license lppl catalogue-topics indic ++++++ bankstatement.doc.tar.xz ++++++ ++++++ bankstatement.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bankstatement.tlpobj new/tlpkg/tlpobj/bankstatement.tlpobj --- old/tlpkg/tlpobj/bankstatement.tlpobj 2016-04-14 18:38:23.000000000 +0200 +++ new/tlpkg/tlpobj/bankstatement.tlpobj 2017-04-14 17:29:46.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/bankstatement/stmgerman.def RELOC/tex/latex/bankstatement/stmnamibian.def catalogue-ctan /macros/latex/contrib/bankstatement -catalogue-date 2015-11-14 18:56:54 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class catalogue-version 0.9.2 ++++++ barcodes.doc.tar.xz ++++++ ++++++ barcodes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/barcodes.tlpobj new/tlpkg/tlpobj/barcodes.tlpobj --- old/tlpkg/tlpobj/barcodes.tlpobj 2016-04-14 18:38:24.000000000 +0200 +++ new/tlpkg/tlpobj/barcodes.tlpobj 2017-04-14 17:29:46.000000000 +0200 @@ -21,6 +21,6 @@ RELOC/tex/latex/barcodes/barcodes.sty catalogue-also code128 ean pst-barcode catalogue-ctan /fonts/barcodes/willadt -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-15 12:22:13 +0200 catalogue-license lppl catalogue-topics barcode ++++++ bardiag.doc.tar.xz ++++++ ++++++ bardiag.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bardiag.tlpobj new/tlpkg/tlpobj/bardiag.tlpobj --- old/tlpkg/tlpobj/bardiag.tlpobj 2016-04-14 18:38:25.000000000 +0200 +++ new/tlpkg/tlpobj/bardiag.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/bardiag/pstfp.sty catalogue-also pst-bar bchart catalogue-ctan /graphics/bardiag -catalogue-date 2015-08-03 08:55:55 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics genchart catalogue-version 0.4a ++++++ barr.doc.tar.xz ++++++ ++++++ barr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/barr.tlpobj new/tlpkg/tlpobj/barr.tlpobj --- old/tlpkg/tlpobj/barr.tlpobj 2016-04-14 18:38:25.000000000 +0200 +++ new/tlpkg/tlpobj/barr.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=13 RELOC/tex/generic/barr/diagxy.tex catalogue-ctan /macros/generic/diagrams/diagxy -catalogue-date 2015-09-30 06:04:59 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram-comm ++++++ bartel-chess-fonts.doc.tar.xz ++++++ ++++++ bartel-chess-fonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bartel-chess-fonts.tlpobj new/tlpkg/tlpobj/bartel-chess-fonts.tlpobj --- old/tlpkg/tlpobj/bartel-chess-fonts.tlpobj 2016-04-14 18:38:26.000000000 +0200 +++ new/tlpkg/tlpobj/bartel-chess-fonts.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -70,6 +70,6 @@ RELOC/fonts/tfm/public/bartel-chess-fonts/pkelch8.tfm RELOC/fonts/tfm/public/bartel-chess-fonts/pkelch9.tfm catalogue-ctan /fonts/bartel-chess-fonts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics games font font-chess font-mf ++++++ bashful.doc.tar.xz ++++++ ++++++ bashful.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bashful.tlpobj new/tlpkg/tlpobj/bashful.tlpobj --- old/tlpkg/tlpobj/bashful.tlpobj 2016-04-14 18:38:26.000000000 +0200 +++ new/tlpkg/tlpobj/bashful.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=5 RELOC/tex/latex/bashful/bashful.sty catalogue-ctan /macros/latex/contrib/bashful -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics ext-code catalogue-version 0.93 ++++++ basicarith.doc.tar.xz ++++++ ++++++ basicarith.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/basicarith.tlpobj new/tlpkg/tlpobj/basicarith.tlpobj --- old/tlpkg/tlpobj/basicarith.tlpobj 2016-04-14 18:38:27.000000000 +0200 +++ new/tlpkg/tlpobj/basicarith.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/basicarith/basicarith.sty catalogue-ctan /macros/latex/contrib/basicarith -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics arithmetic calculation catalogue-version 1.1 ++++++ baskervald.doc.tar.xz ++++++ ++++++ baskervald.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervald.tlpobj new/tlpkg/tlpobj/baskervald.tlpobj --- old/tlpkg/tlpobj/baskervald.tlpobj 2016-04-14 18:38:27.000000000 +0200 +++ new/tlpkg/tlpobj/baskervald.tlpobj 2017-04-14 17:29:47.000000000 +0200 @@ -91,7 +91,7 @@ RELOC/tex/latex/baskervald/ts1ybvw.fd catalogue-also baskervaldx catalogue-ctan /fonts/baskervaldadf -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-type1 font-serif catalogue-version 1.016 ++++++ baskervaldx.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/baskervaldx/README new/doc/fonts/baskervaldx/README --- old/doc/fonts/baskervaldx/README 2015-04-07 23:06:23.000000000 +0200 +++ new/doc/fonts/baskervaldx/README 2017-03-12 01:01:03.000000000 +0100 @@ -12,7 +12,14 @@ http://www.ctan.org/license/lppl1.3 for the details of that license. -Current version: 1.07, 2015/04/06 +Current version: 1.072, 2017/03/10 + +Changes in version 1.072 +Modified the sty file so that Baskervaldx text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.) + + +Changes in version 1.071 +Modified some metadata in the otf files, correcting some misbehaviors in some programs and platforms. Changes in version 1.07 1. Corrected definition of \tosfstyle in Baskervaldx.sty. Binary files old/doc/fonts/baskervaldx/baskervaldx-doc.pdf and new/doc/fonts/baskervaldx/baskervaldx-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/baskervaldx/baskervaldx-doc.tex new/doc/fonts/baskervaldx/baskervaldx-doc.tex --- old/doc/fonts/baskervaldx/baskervaldx-doc.tex 2014-11-29 00:26:30.000000000 +0100 +++ new/doc/fonts/baskervaldx/baskervaldx-doc.tex 2017-03-12 01:01:03.000000000 +0100 @@ -94,8 +94,9 @@ For example, ordinary {\tt newtxmath} works quite well, as in: \begin{verbatim} +% If you use babel, load it here, before Baskervaldx \usepackage[osf]{Baskervaldx} % tosf in text, tlf in math -\usepackage[bigdelims,vvarbb]{newtxmath} % math italic letters from Times +\usepackage[vvarbb]{newtxmath} % math italic letters from Times \usepackage[cal=boondoxo]{mathalfa} % mathcal from STIX, unslanted a bit \end{verbatim} Here's an example to show both source and typeset text with this combination. @@ -127,8 +128,9 @@ To use the version of {\tt newtxmath} with Baskervaldx math italics, use the following:\\ \begin{verbatim} +% If you use babel, load it here, before Baskervaldx \usepackage[osf]{Baskervaldx} % tosf in text, tlf in math -\usepackage[baskervaldx,cmintegrals,bigdelims,vvarbb]{newtxmath} % math italic letters from Baskervaldx +\usepackage[baskervaldx,vvarbb]{newtxmath} % math italic letters from Baskervaldx \usepackage[cal=boondoxo]{mathalfa} % mathcal from STIX, unslanted a bit \end{verbatim} Here's the same source rendered with this preamble.\\[10pt] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervaldx.doc.tlpobj new/tlpkg/tlpobj/baskervaldx.doc.tlpobj --- old/tlpkg/tlpobj/baskervaldx.doc.tlpobj 2016-04-14 18:38:28.000000000 +0200 +++ new/tlpkg/tlpobj/baskervaldx.doc.tlpobj 2017-04-14 17:29:48.000000000 +0200 @@ -1,9 +1,9 @@ name baskervaldx.doc category Package -revision 36734 +revision 43461 shortdesc doc files of baskervaldx relocated 1 -docfiles size=57 +docfiles size=66 RELOC/doc/fonts/baskervaldx/COPYING RELOC/doc/fonts/baskervaldx/NOTICE.txt RELOC/doc/fonts/baskervaldx/README ++++++ baskervaldx.tar.xz ++++++ Binary files old/fonts/opentype/public/baskervaldx/Baskervaldx-Bol.otf and new/fonts/opentype/public/baskervaldx/Baskervaldx-Bol.otf differ Binary files old/fonts/opentype/public/baskervaldx/Baskervaldx-BolIta.otf and new/fonts/opentype/public/baskervaldx/Baskervaldx-BolIta.otf differ Binary files old/fonts/opentype/public/baskervaldx/Baskervaldx-Ita.otf and new/fonts/opentype/public/baskervaldx/Baskervaldx-Ita.otf differ Binary files old/fonts/opentype/public/baskervaldx/Baskervaldx-Reg.otf and new/fonts/opentype/public/baskervaldx/Baskervaldx-Reg.otf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/baskervaldx/Baskervaldx.sty new/tex/latex/baskervaldx/Baskervaldx.sty --- old/tex/latex/baskervaldx/Baskervaldx.sty 2015-04-07 23:06:23.000000000 +0200 +++ new/tex/latex/baskervaldx/Baskervaldx.sty 2017-03-12 01:01:04.000000000 +0100 @@ -1,8 +1,8 @@ %% Baskervaldx.sty %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.07} -\def\filedate{2015/04/06} +\def\fileversion{1.072} +\def\filedate{2017/03/10} \ProvidesPackage{Baskervaldx} [\filedate\space v\fileversion] @@ -44,8 +44,8 @@ \def\mdseries@rm{m} \newif\if@Baskervaldx@sups \newif\if@Baskervaldx@sw -\newif\ifBaskervaldx@babel -\ifdefined\bbl@tempa \Baskervaldx@babeltrue\fi +%\newif\ifBaskervaldx@babel +%\ifdefined\bbl@tempa \Baskervaldx@babeltrue\fi \DeclareOptionX{lining}{\edef\Baskervaldx@figurestyle{LF}} \DeclareOptionX{lf}{\edef\Baskervaldx@figurestyle{LF}} @@ -116,16 +116,16 @@ \fi% \fi -\ifBaskervaldx@babel - \renewcommand*{\swdefault}{sw} - \renewcommand*{\rmdefault}% - {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle} - \normalfont -\else +%\ifBaskervaldx@babel +% \renewcommand*{\swdefault}{sw} +% \renewcommand*{\rmdefault}% +% {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle} +% \normalfont +%\else \AtEndPreamble{% \renewcommand*{\swdefault}{sw} \renewcommand*{\rmdefault}% {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle} \normalfont} -\fi +%\fi \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervaldx.tlpobj new/tlpkg/tlpobj/baskervaldx.tlpobj --- old/tlpkg/tlpobj/baskervaldx.tlpobj 2016-04-14 18:38:28.000000000 +0200 +++ new/tlpkg/tlpobj/baskervaldx.tlpobj 2017-04-14 17:29:48.000000000 +0200 @@ -1,6 +1,6 @@ name baskervaldx category Package -revision 36734 +revision 43461 shortdesc Extension and modification of BaskervaldADF with LaTeX support relocated 1 longdesc Extends and modifies the BaskervaldADF font (a Baskerville @@ -8,7 +8,7 @@ longdesc oldstyle figures in all shapes. Includes OpenType and longdesc PostScript fonts, as well as LaTeX support files. execute addMap baskervaldx.map -runfiles size=1155 +runfiles size=1150 RELOC/fonts/afm/public/baskervaldx/Baskervaldx-Bol.afm RELOC/fonts/afm/public/baskervaldx/Baskervaldx-BolIta.afm RELOC/fonts/afm/public/baskervaldx/Baskervaldx-Ita.afm @@ -475,7 +475,7 @@ RELOC/tex/latex/baskervaldx/TS1Baskervaldx-TOsF.fd RELOC/tex/latex/baskervaldx/baskervaldx.fontspec catalogue-ctan /fonts/baskervaldx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-11 09:14:11 +0100 catalogue-license gpl catalogue-topics font-otf font-type1 font-serif -catalogue-version 1.07 +catalogue-version 1.072 ++++++ basque-book.doc.tar.xz ++++++ ++++++ basque-book.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/basque-book.tlpobj new/tlpkg/tlpobj/basque-book.tlpobj --- old/tlpkg/tlpobj/basque-book.tlpobj 2016-04-14 18:38:31.000000000 +0200 +++ new/tlpkg/tlpobj/basque-book.tlpobj 2017-04-14 17:29:51.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=6 RELOC/tex/latex/basque-book/basque-book.cls catalogue-ctan /macros/latex/contrib/basque-book -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics book-pub dissertation class basque catalogue-version 1.20

1 0

commit texlive-specs-a for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-a for openSUSE:Factory checked in at 2017-06-25 19:21:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-a (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-a.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-a" Sun Jun 25 19:21:09 2017 rev:27 rq:504788 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.changes 2017-06-08 14:53:48.328908835 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-a.new/texlive-specs-a.changes 2017-06-25 19:21:24.586407074 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)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(a)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(a)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(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- around-the-bend.doc.tar.xz arphic.doc.tar.xz arphic.tar.xz New: ---- actuarialsymbol.doc.tar.xz actuarialsymbol.tar.xz addfont.doc.tar.xz addfont.tar.xz alkalami.doc.tar.xz alkalami.tar.xz apalike-german.doc.tar.xz apalike-german.tar.xz apxproof.doc.tar.xz apxproof.tar.xz arimo.doc.tar.xz arimo.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-a.spec ++++++ ++++ 7627 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-a.new/texlive-specs-a.spec ++++++ 12many.doc.tar.xz ++++++ ++++++ 12many.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/12many.tlpobj new/tlpkg/tlpobj/12many.tlpobj --- old/tlpkg/tlpobj/12many.tlpobj 2016-04-14 18:32:21.000000000 +0200 +++ new/tlpkg/tlpobj/12many.tlpobj 2017-04-14 17:26:43.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/12many/12many.sty catalogue-ctan /macros/latex/contrib/12many -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 ++++++ 2up.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/2up.doc.tlpobj new/tlpkg/tlpobj/2up.doc.tlpobj --- old/tlpkg/tlpobj/2up.doc.tlpobj 2016-04-14 18:32:21.000000000 +0200 +++ new/tlpkg/tlpobj/2up.doc.tlpobj 2017-04-14 17:26:44.000000000 +0200 @@ -1,6 +1,6 @@ name 2up.doc category Package -revision 40417 +revision 41578 shortdesc doc files of 2up relocated 1 docfiles size=24 ++++++ 2up.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/2up.tlpobj new/tlpkg/tlpobj/2up.tlpobj --- old/tlpkg/tlpobj/2up.tlpobj 2016-04-14 18:32:21.000000000 +0200 +++ new/tlpkg/tlpobj/2up.tlpobj 2017-04-14 17:26:44.000000000 +0200 @@ -1,8 +1,18 @@ name 2up category Package -revision 40417 -catalogue twoup-gen.xml +revision 41578 +catalogue twoup-gen +shortdesc Macros to print two-up relocated 1 +longdesc The 2up package offers considerable flexibility as to paper +longdesc size and layout, and produces a standard dvi file without +longdesc involving additional dvi or PostScript filters. runfiles size=4 RELOC/tex/generic/2up/2up.sty RELOC/tex/generic/2up/2up.tex +catalogue-also twoupltx +catalogue-ctan /macros/generic/2up +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license other-free +catalogue-topics layout +catalogue-version 1.2 ++++++ Asana-Math.doc.tar.xz ++++++ ++++++ Asana-Math.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Asana-Math.tlpobj new/tlpkg/tlpobj/Asana-Math.tlpobj --- old/tlpkg/tlpobj/Asana-Math.tlpobj 2016-04-14 18:32:21.000000000 +0200 +++ new/tlpkg/tlpobj/Asana-Math.tlpobj 2017-04-14 17:26:44.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/fonts/truetype/public/Asana-Math/ASANA.TTC catalogue-also stix xits catalogue-ctan /fonts/Asana-Math -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-maths font-otf font-ttf catalogue-version 000.955 ++++++ ESIEEcv.doc.tar.xz ++++++ ++++++ ESIEEcv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ESIEEcv.tlpobj new/tlpkg/tlpobj/ESIEEcv.tlpobj --- old/tlpkg/tlpobj/ESIEEcv.tlpobj 2016-04-14 18:32:22.000000000 +0200 +++ new/tlpkg/tlpobj/ESIEEcv.tlpobj 2017-04-14 17:26:44.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/latex/ESIEEcv/ESIEEcv.sty catalogue-also curve currvita cv europecv vita catalogue-ctan /macros/latex/contrib/ESIEEcv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cv french ++++++ FAQ-en.doc.tar.xz ++++++ ++++++ GS1.doc.tar.xz ++++++ ++++++ GS1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/GS1.tlpobj new/tlpkg/tlpobj/GS1.tlpobj --- old/tlpkg/tlpobj/GS1.tlpobj 2016-04-14 18:32:31.000000000 +0200 +++ new/tlpkg/tlpobj/GS1.tlpobj 2017-04-14 17:26:48.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/GS1/GS1.sty RELOC/tex/latex/GS1/rule-D.sty catalogue-ctan /macros/latex/contrib/gs1 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics barcode catalogue-version 15 ++++++ HA-prosper.doc.tar.xz ++++++ ++++++ HA-prosper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/HA-prosper.tlpobj new/tlpkg/tlpobj/HA-prosper.tlpobj --- old/tlpkg/tlpobj/HA-prosper.tlpobj 2016-04-14 18:32:32.000000000 +0200 +++ new/tlpkg/tlpobj/HA-prosper.tlpobj 2017-04-14 17:26:48.000000000 +0200 @@ -30,7 +30,7 @@ RELOC/tex/latex/HA-prosper/Styles/Tycja/HAPTycja.sty catalogue-also powerdot catalogue-ctan /macros/latex/contrib/ha-prosper -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 4.21 ++++++ IEEEconf.doc.tar.xz ++++++ ++++++ IEEEconf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/IEEEconf.tlpobj new/tlpkg/tlpobj/IEEEconf.tlpobj --- old/tlpkg/tlpobj/IEEEconf.tlpobj 2016-04-14 18:32:32.000000000 +0200 +++ new/tlpkg/tlpobj/IEEEconf.tlpobj 2017-04-14 17:26:48.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/IEEEconf/IEEEconf.cls catalogue-ctan /macros/latex/contrib/IEEEconf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics confproc class catalogue-version 1.4 ++++++ IEEEtran.doc.tar.xz ++++++ ++++++ IEEEtran.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/IEEEtran.tlpobj new/tlpkg/tlpobj/IEEEtran.tlpobj --- old/tlpkg/tlpobj/IEEEtran.tlpobj 2016-04-14 18:32:34.000000000 +0200 +++ new/tlpkg/tlpobj/IEEEtran.tlpobj 2017-04-14 17:26:49.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/IEEEtran/IEEEtran.cls RELOC/tex/latex/IEEEtran/IEEEtrantools.sty catalogue-ctan /macros/latex/contrib/IEEEtran -catalogue-date 2015-08-28 21:41:19 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics journalpub class catalogue-version 1.8b ++++++ MemoirChapStyles.doc.tar.xz ++++++ ++++++ SIstyle.doc.tar.xz ++++++ ++++++ SIstyle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/SIstyle.tlpobj new/tlpkg/tlpobj/SIstyle.tlpobj --- old/tlpkg/tlpobj/SIstyle.tlpobj 2016-04-14 18:32:35.000000000 +0200 +++ new/tlpkg/tlpobj/SIstyle.tlpobj 2017-04-14 17:26:49.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/SIstyle/sistyle.sty catalogue-ctan /macros/latex/contrib/SIstyle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting scientific-docs catalogue-version 2.3a ++++++ SIunits.doc.tar.xz ++++++ ++++++ SIunits.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/SIunits.tlpobj new/tlpkg/tlpobj/SIunits.tlpobj --- old/tlpkg/tlpobj/SIunits.tlpobj 2016-04-14 18:32:36.000000000 +0200 +++ new/tlpkg/tlpobj/SIunits.tlpobj 2017-04-14 17:26:49.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/SIunits/binary.sty catalogue-also sistyle catalogue-ctan /macros/latex/contrib/SIunits -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting scientific-docs catalogue-version 1.36 ++++++ Tabbing.doc.tar.xz ++++++ ++++++ Tabbing.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Tabbing.tlpobj new/tlpkg/tlpobj/Tabbing.tlpobj --- old/tlpkg/tlpobj/Tabbing.tlpobj 2016-04-14 18:32:36.000000000 +0200 +++ new/tlpkg/tlpobj/Tabbing.tlpobj 2017-04-14 17:26:50.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=1 RELOC/tex/latex/Tabbing/Tabbing.sty catalogue-ctan /macros/latex/contrib/Tabbing -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics alignment macro-supp ++++++ Type1fonts.doc.tar.xz ++++++ ++++++ a0poster.doc.tar.xz ++++++ ++++++ a0poster.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a0poster.tlpobj new/tlpkg/tlpobj/a0poster.tlpobj --- old/tlpkg/tlpobj/a0poster.tlpobj 2016-04-14 18:32:37.000000000 +0200 +++ new/tlpkg/tlpobj/a0poster.tlpobj 2017-04-14 17:26:50.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/a0poster/a0size.sty catalogue-also sciposter catalogue-ctan /macros/latex/contrib/a0poster -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics poster catalogue-version 1.22b ++++++ a2ping.doc.tar.xz ++++++ ++++++ a2ping.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a2ping.tlpobj new/tlpkg/tlpobj/a2ping.tlpobj --- old/tlpkg/tlpobj/a2ping.tlpobj 2016-04-14 18:32:37.000000000 +0200 +++ new/tlpkg/tlpobj/a2ping.tlpobj 2017-04-14 17:26:50.000000000 +0200 @@ -16,6 +16,6 @@ runfiles size=26 texmf-dist/scripts/a2ping/a2ping.pl catalogue-ctan /graphics/a2ping -catalogue-date 2015-08-04 06:24:20 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-prep ++++++ a4wide.doc.tar.xz ++++++ ++++++ a4wide.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a4wide.tlpobj new/tlpkg/tlpobj/a4wide.tlpobj --- old/tlpkg/tlpobj/a4wide.tlpobj 2016-04-14 18:32:38.000000000 +0200 +++ new/tlpkg/tlpobj/a4wide.tlpobj 2017-04-14 17:26:50.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/a4wide/a4wide.sty catalogue-ctan /macros/latex/contrib/a4wide -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics geometry ++++++ a5comb.doc.tar.xz ++++++ ++++++ a5comb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a5comb.tlpobj new/tlpkg/tlpobj/a5comb.tlpobj --- old/tlpkg/tlpobj/a5comb.tlpobj 2016-04-14 18:32:38.000000000 +0200 +++ new/tlpkg/tlpobj/a5comb.tlpobj 2017-04-14 17:26:51.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=1 RELOC/tex/latex/a5comb/a5comb.sty catalogue-ctan /macros/latex/contrib/a5comb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics geometry catalogue-version 4 ++++++ aastex.doc.tar.xz ++++++ ++++++ aastex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aastex.tlpobj new/tlpkg/tlpobj/aastex.tlpobj --- old/tlpkg/tlpobj/aastex.tlpobj 2016-04-14 18:32:41.000000000 +0200 +++ new/tlpkg/tlpobj/aastex.tlpobj 2017-04-14 17:26:52.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/bibtex/bst/aastex/aasjournal.bst RELOC/tex/latex/aastex/aastex6.cls catalogue-ctan /macros/latex/contrib/aastex -catalogue-date 2016-03-02 21:52:15 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics astronomy journalpub class catalogue-version 6.0 ++++++ abbr.doc.tar.xz ++++++ ++++++ abbr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abbr.tlpobj new/tlpkg/tlpobj/abbr.tlpobj --- old/tlpkg/tlpobj/abbr.tlpobj 2016-04-14 18:32:41.000000000 +0200 +++ new/tlpkg/tlpobj/abbr.tlpobj 2017-04-14 17:26:52.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=2 RELOC/tex/generic/abbr/abbr.tex catalogue-ctan /macros/generic/abbr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics abbrev shortcut ++++++ abc.doc.tar.xz ++++++ ++++++ abc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abc.tlpobj new/tlpkg/tlpobj/abc.tlpobj --- old/tlpkg/tlpobj/abc.tlpobj 2016-05-16 00:50:27.000000000 +0200 +++ new/tlpkg/tlpobj/abc.tlpobj 2017-04-14 17:26:52.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/abc/mup.sty catalogue-also abc2mtex catalogue-ctan /macros/latex/contrib/abc -catalogue-date 2016-05-15 20:12:00 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics music foreign-import catalogue-version 2.0b ++++++ abntex2.doc.tar.xz ++++++ ++++++ abntex2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abntex2.tlpobj new/tlpkg/tlpobj/abntex2.tlpobj --- old/tlpkg/tlpobj/abntex2.tlpobj 2016-04-14 18:32:46.000000000 +0200 +++ new/tlpkg/tlpobj/abntex2.tlpobj 2017-04-14 17:26:54.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/abntex2/abntex2abrev.sty RELOC/tex/latex/abntex2/abntex2cite.sty catalogue-ctan /macros/latex/contrib/abntex2 -catalogue-date 2016-02-27 15:35:16 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class portuguese-br catalogue-version 1.9.6 ++++++ abraces.doc.tar.xz ++++++ ++++++ abraces.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abraces.tlpobj new/tlpkg/tlpobj/abraces.tlpobj --- old/tlpkg/tlpobj/abraces.tlpobj 2016-04-14 18:32:46.000000000 +0200 +++ new/tlpkg/tlpobj/abraces.tlpobj 2017-04-14 17:26:54.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/abraces/abraces.sty catalogue-ctan /macros/latex/contrib/abraces -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-symbol catalogue-version 1.- ++++++ abstract.doc.tar.xz ++++++ ++++++ abstract.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abstract.tlpobj new/tlpkg/tlpobj/abstract.tlpobj --- old/tlpkg/tlpobj/abstract.tlpobj 2016-04-14 18:32:47.000000000 +0200 +++ new/tlpkg/tlpobj/abstract.tlpobj 2017-04-14 17:26:54.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/abstract/abstract.sty catalogue-ctan /macros/latex/contrib/abstract -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics abstract catalogue-version 1.2a ++++++ abstyles.doc.tar.xz ++++++ ++++++ abstyles.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abstyles.tlpobj new/tlpkg/tlpobj/abstyles.tlpobj --- old/tlpkg/tlpobj/abstyles.tlpobj 2016-04-14 18:32:47.000000000 +0200 +++ new/tlpkg/tlpobj/abstyles.tlpobj 2017-04-14 17:26:54.000000000 +0200 @@ -20,6 +20,6 @@ RELOC/bibtex/bst/abstyles/aunsrt.bst RELOC/tex/generic/abstyles/apreambl.tex catalogue-ctan /biblio/bibtex/contrib/abstyles -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 ++++++ academicons.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/academicons/README new/doc/fonts/academicons/README --- old/doc/fonts/academicons/README 2016-05-16 22:31:13.000000000 +0200 +++ new/doc/fonts/academicons/README 2017-05-16 23:06:34.000000000 +0200 @@ -1,6 +1,6 @@ academicons -- high quality icons of online academic profiles -The "academicons" package provides access in (La)TeX to 36 high quality icons +The "academicons" package provides access in (La)TeX to 62 high quality icons of online academic profiles included in the free "Academicons" font. This package requires the "fontspec" package and either the Xe(La)TeX or Lua(La)TeX engine to load "Academicons" font from the system, which requires installing the @@ -24,7 +24,7 @@ "\aiGoogleScholar". academicons (La)TeX package -Version: 1.7.0 +Version: 1.8.0 Author: Diogo A. B. Fernandes, diogoabfernandes@gmail License: LaTeX Project Public License, version 1.3c Binary files old/doc/fonts/academicons/academicons.pdf and new/doc/fonts/academicons/academicons.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/academicons/academicons.tex new/doc/fonts/academicons/academicons.tex --- old/doc/fonts/academicons/academicons.tex 2016-05-16 22:31:13.000000000 +0200 +++ new/doc/fonts/academicons/academicons.tex 2017-05-16 23:06:34.000000000 +0200 @@ -29,13 +29,16 @@ \author{% Diogo A. B. Fernandes\thanks{Email: \href{mailto:diogoabfernandes@gmail.com}{\tt diogoabfernandes(a)gmail.com}}~~(\hologo{LaTeX} code)\\% James Walsh (font and icons design)} -\date{v1.7.0, released on May 16, 2016} +\date{v1.8.0, released on May 15, 2017} \maketitle \begin{abstract} The \textsf{\jobname} package provides specific \hologo{(La)TeX} bindings with the free \emph{Academicons} font, allowing to access \total{IconsCounter} high quality icons of online academic profiles. \end{abstract} +\changes{v1.8.0}{2017/05/15}{Major release of v1.8.0.} +\changes{v1.7.2}{2016/06/12}{Fix release: corrected a bug in the style file.} +\changes{v1.7.1}{2016/06/12}{Fix release: corrected a bug in the style file.} \changes{v1.7.0}{2016/05/16}{Major release of v1.7.0.} \changes{v1.6.0-1}{2016/03/02}{Better documentation.} \changes{v1.6.0}{2016/01/30}{Major release of v1.6.0.} @@ -79,21 +82,34 @@ \begin{showcase} \icon{academia}{aiAcademia} \icon{acclaim}{aiAcclaim} - \icon{arxiv}{aiArxiv} + \icon{acm}{aiACM} + \icon{ads}{aiADS} + \icon{arxiv}{aiarXiv} + \icon{biorxiv}{aibioRxiv} + \icon{ceur}{aiCEUR} \icon{coursera}{aiCoursera} + \icon{dataverse}{aidataverse} + \icon{dblp}{aidblp} + \icon{depsy}{aiDepsy} \icon{doi}{aiDoi} \icon{dryad}{aiDryad} \icon{figshare}{aiFigshare} \icon{googlescholar}{aiGoogleScholar} + \icon{ieee}{aiIEEE} \icon{impactstory}{aiImpactstory} \icon{inspire}{aiInspire} \icon{mendeley}{aiMendeley} \icon{open-access}{aiOpenAccess} \icon{orcid}{aiOrcid} - \icon{osf}{aiOsf} + \icon{osf}{aiOSF} + \icon{overleaf}{aiOverleaf} + \icon{philpapers}{aiPhilPapers} + \icon{piazza}{aiPiazza} + \icon{publons}{aiPublons} \icon{pubmed}{aiPubMed} \icon{researchgate}{aiResearchGate} \icon{scirate}{aiSciRate} + \icon{springer}{aiSpringer} \icon{zotero}{aiZotero} \end{showcase} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/academicons.doc.tlpobj new/tlpkg/tlpobj/academicons.doc.tlpobj --- old/tlpkg/tlpobj/academicons.doc.tlpobj 2016-05-17 03:15:32.000000000 +0200 +++ new/tlpkg/tlpobj/academicons.doc.tlpobj 2017-05-17 02:22:03.000000000 +0200 @@ -1,9 +1,9 @@ name academicons.doc category Package -revision 41194 +revision 44380 shortdesc doc files of academicons relocated 1 -docfiles size=24 +docfiles size=26 RELOC/doc/fonts/academicons/README RELOC/doc/fonts/academicons/academicons.pdf RELOC/doc/fonts/academicons/academicons.tex ++++++ academicons.tar.xz ++++++ Binary files old/fonts/truetype/public/academicons/academicons.ttf and new/fonts/truetype/public/academicons/academicons.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/academicons/academicons.sty new/tex/latex/academicons/academicons.sty --- old/tex/latex/academicons/academicons.sty 2016-05-16 22:31:13.000000000 +0200 +++ new/tex/latex/academicons/academicons.sty 2017-05-16 23:06:34.000000000 +0200 @@ -5,184 +5,301 @@ % available at http://www.latex-project.org/lppl/. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{academicons}[v1.7.0 2016/05/16 Academicons Icons] +\ProvidesPackage{academicons}[2017/05/15 v1.8.0 Academicons Icons] \usepackage{fontspec} -\newfontfamily{\AI}{Academicons} +\newfontfamily{\AI}{academicons} \newcommand*{\aiicon}[1] {\AI\csname aiicon@#1\endcsname} \expandafter\def\csname% - aiicon@googlescholar\endcsname{\symbol{"E900}} -\def\aiGoogleScholar{{\AI\csname% - aiicon@googlescholar\endcsname}} + aiicon@academia\endcsname{\symbol{"E800}} +\def\aiAcademia{{\AI\csname% + aiicon@academia\endcsname}} \expandafter\def\csname% - aiicon@googlescholar-square\endcsname{\symbol{"E901}} -\def\aiGoogleScholarSquare{{\AI\csname% - aiicon@googlescholar-square\endcsname}} + aiicon@academia-square\endcsname{\symbol{"E801}} +\def\aiAcademiaSquare{{\AI\csname% + aiicon@academia-square\endcsname}} \expandafter\def\csname% - aiicon@researchgate\endcsname{\symbol{"E902}} -\def\aiResearchGate{{\AI\csname% - aiicon@researchgate\endcsname}} + aiicon@acclaim\endcsname{\symbol{"E802}} +\def\aiAcclaim{{\AI\csname% + aiicon@acclaim\endcsname}} \expandafter\def\csname% - aiicon@researchgate-square\endcsname{\symbol{"E903}} -\def\aiResearchGateSquare{{\AI\csname% - aiicon@researchgate-square\endcsname}} + aiicon@acclaim-square\endcsname{\symbol{"E803}} +\def\aiAcclaimSquare{{\AI\csname% + aiicon@acclaim-square\endcsname}} -% \expandafter\def\csname% -% aiicon@researchgateold\endcsname{\symbol{"E602}} -% \def\aiResearchGateOld{{\AI\csname% -% aiicon@researchgateold\endcsname}} -% \expandafter\def\csname% -% aiicon@researchgateold-square\endcsname{\symbol{"E603}} -% \def\aiResearchGateOldSquare{{\AI\csname% -% aiicon@researchgateold-square\endcsname}} +\expandafter\def\csname% + aiicon@acm\endcsname{\symbol{"E804}} +\def\aiACM{{\AI\csname% + aiicon@acm\endcsname}} +\expandafter\def\csname% + aiicon@acm-square\endcsname{\symbol{"E805}} +\def\aiACMSquare{{\AI\csname% + aiicon@acm-square\endcsname}} \expandafter\def\csname% - aiicon@mendeley\endcsname{\symbol{"E904}} -\def\aiMendeley{{\AI\csname% - aiicon@mendeley\endcsname}} + aiicon@ads\endcsname{\symbol{"E806}} +\def\aiADS{{\AI\csname% + aiicon@ads\endcsname}} \expandafter\def\csname% - aiicon@mendeley-square\endcsname{\symbol{"E905}} -\def\aiMendeleySquare{{\AI\csname% - aiicon@mendeley-square\endcsname}} + aiicon@ads-square\endcsname{\symbol{"E807}} +\def\aiADSSquare{{\AI\csname% + aiicon@ads-square\endcsname}} \expandafter\def\csname% - aiicon@orcid\endcsname{\symbol{"E906}} -\def\aiOrcid{{\AI\csname% - aiicon@orcid\endcsname}} + aiicon@arxiv\endcsname{\symbol{"E808}} +\def\aiarXiv{{\AI\csname% + aiicon@arxiv\endcsname}} \expandafter\def\csname% - aiicon@orcid-square\endcsname{\symbol{"E907}} -\def\aiOrcidSquare{{\AI\csname% - aiicon@orcid-square\endcsname}} + aiicon@arxiv-square\endcsname{\symbol{"E809}} +\def\aiarXivSquare{{\AI\csname% + aiicon@arxiv-square\endcsname}} \expandafter\def\csname% - aiicon@impactstory\endcsname{\symbol{"E908}} -\def\aiImpactstory{{\AI\csname% - aiicon@impactstory\endcsname}} + aiicon@biorxiv\endcsname{\symbol{"E810}} +\def\aibioRxiv{{\AI\csname% + aiicon@biorxiv\endcsname}} \expandafter\def\csname% - aiicon@impactstory-square\endcsname{\symbol{"E909}} -\def\aiImpactstorySquare{{\AI\csname% - aiicon@impactstory-square\endcsname}} + aiicon@biorxiv-square\endcsname{\symbol{"E811}} +\def\aibioRxivSquare{{\AI\csname% + aiicon@biorxiv-square\endcsname}} \expandafter\def\csname% - aiicon@academia\endcsname{\symbol{"E910}} -\def\aiAcademia{{\AI\csname% - aiicon@academia\endcsname}} + aiicon@ceur\endcsname{\symbol{"E812}} +\def\aiCEUR{{\AI\csname% + aiicon@ceur\endcsname}} \expandafter\def\csname% - aiicon@academia-square\endcsname{\symbol{"E911}} -\def\aiAcademiaSquare{{\AI\csname% - aiicon@academia-square\endcsname}} + aiicon@ceur-square\endcsname{\symbol{"E813}} +\def\aiCEURSquare{{\AI\csname% + aiicon@ceur-square\endcsname}} \expandafter\def\csname% - aiicon@zotero\endcsname{\symbol{"E912}} -\def\aiZotero{{\AI\csname% - aiicon@zotero\endcsname}} + aiicon@coursera\endcsname{\symbol{"E814}} +\def\aiCoursera{{\AI\csname% + aiicon@coursera\endcsname}} \expandafter\def\csname% - aiicon@zotero-square\endcsname{\symbol{"E913}} -\def\aiZoteroSquare{{\AI\csname% - aiicon@zotero-square\endcsname}} + aiicon@coursera-square\endcsname{\symbol{"E815}} +\def\aiCourseraSquare{{\AI\csname% + aiicon@coursera-square\endcsname}} \expandafter\def\csname% - aiicon@figshare\endcsname{\symbol{"E914}} -\def\aiFigshare{{\AI\csname% - aiicon@figshare\endcsname}} + aiicon@dataverse\endcsname{\symbol{"E816}} +\def\aiDataverse{{\AI\csname% + aiicon@dataverse\endcsname}} \expandafter\def\csname% - aiicon@figshare-square\endcsname{\symbol{"E915}} -\def\aiFigshareSquare{{\AI\csname% - aiicon@figshare-square\endcsname}} + aiicon@dataverse-square\endcsname{\symbol{"E817}} +\def\aiDataverseSquare{{\AI\csname% + aiicon@dataverse-square\endcsname}} + +\expandafter\def\csname% + aiicon@dblp\endcsname{\symbol{"E818}} +\def\aidblp{{\AI\csname% + aiicon@dblp\endcsname}} +\expandafter\def\csname% + aiicon@dblp-square\endcsname{\symbol{"E819}} +\def\aidblpSquare{{\AI\csname% + aiicon@dblp-square\endcsname}} + +\expandafter\def\csname% + aiicon@depsy\endcsname{\symbol{"E820}} +\def\aiDepsy{{\AI\csname% + aiicon@depsy\endcsname}} +\expandafter\def\csname% + aiicon@depsy-square\endcsname{\symbol{"E821}} +\def\aiDepsySquare{{\AI\csname% + aiicon@depsy-square\endcsname}} \expandafter\def\csname% - aiicon@dryad\endcsname{\symbol{"E916}} + aiicon@doi\endcsname{\symbol{"E822}} +\def\aiDoi{{\AI\csname% + aiicon@doi\endcsname}} +\expandafter\def\csname% + aiicon@doi-square\endcsname{\symbol{"E823}} +\def\aiDoiSquare{{\AI\csname% + aiicon@doi-square\endcsname}} + +\expandafter\def\csname% + aiicon@dryad\endcsname{\symbol{"E824}} \def\aiDryad{{\AI\csname% aiicon@dryad\endcsname}} \expandafter\def\csname% - aiicon@dryad-square\endcsname{\symbol{"E917}} + aiicon@dryad-square\endcsname{\symbol{"E825}} \def\aiDryadSquare{{\AI\csname% aiicon@dryad-square\endcsname}} \expandafter\def\csname% - aiicon@arxiv\endcsname{\symbol{"E918}} -\def\aiArxiv{{\AI\csname% - aiicon@arxiv\endcsname}} + aiicon@figshare\endcsname{\symbol{"E826}} +\def\aiFigshare{{\AI\csname% + aiicon@figshare\endcsname}} \expandafter\def\csname% - aiicon@arxiv-square\endcsname{\symbol{"E919}} -\def\aiArxivSquare{{\AI\csname% - aiicon@arxiv-square\endcsname}} + aiicon@figshare-square\endcsname{\symbol{"E827}} +\def\aiFigshareSquare{{\AI\csname% + aiicon@figshare-square\endcsname}} \expandafter\def\csname% - aiicon@scirate\endcsname{\symbol{"E920}} -\def\aiSciRate{{\AI\csname% - aiicon@scirate\endcsname}} + aiicon@googlescholar\endcsname{\symbol{"E828}} +\def\aiGoogleScholar{{\AI\csname% + aiicon@googlescholar\endcsname}} \expandafter\def\csname% - aiicon@scirate-square\endcsname{\symbol{"E921}} -\def\aiSciRateSquare{{\AI\csname% - aiicon@scirate-square\endcsname}} + aiicon@googlescholar-square\endcsname{\symbol{"E829}} +\def\aiGoogleScholarSquare{{\AI\csname% + aiicon@googlescholar-square\endcsname}} + +\expandafter\def\csname% + aiicon@ieee\endcsname{\symbol{"E830}} +\def\aiIEEE{{\AI\csname% + aiicon@ieee\endcsname}} +\expandafter\def\csname% + aiicon@ieee-square\endcsname{\symbol{"E831}} +\def\aiIEEESquare{{\AI\csname% + aiicon@ieee-square\endcsname}} + +\expandafter\def\csname% + aiicon@impactstory\endcsname{\symbol{"E832}} +\def\aiImpactstory{{\AI\csname% + aiicon@impactstory\endcsname}} +\expandafter\def\csname% + aiicon@impactstory-square\endcsname{\symbol{"E833}} +\def\aiImpactstorySquare{{\AI\csname% + aiicon@impactstory-square\endcsname}} \expandafter\def\csname% - aiicon@open-access\endcsname{\symbol{"E922}} + aiicon@inspire\endcsname{\symbol{"E834}} +\def\aiInspire{{\AI\csname% + aiicon@inspire\endcsname}} +\expandafter\def\csname% + aiicon@inspire-square\endcsname{\symbol{"E835}} +\def\aiInspireSquare{{\AI\csname% + aiicon@inspire-square\endcsname}} + +\expandafter\def\csname% + aiicon@mendeley\endcsname{\symbol{"E836}} +\def\aiMendeley{{\AI\csname% + aiicon@mendeley\endcsname}} +\expandafter\def\csname% + aiicon@mendeley-square\endcsname{\symbol{"E837}} +\def\aiMendeleySquare{{\AI\csname% + aiicon@mendeley-square\endcsname}} + +\expandafter\def\csname% + aiicon@open-access\endcsname{\symbol{"E838}} \def\aiOpenAccess{{\AI\csname% aiicon@open-access\endcsname}} \expandafter\def\csname% - aiicon@open-access-square\endcsname{\symbol{"E923}} + aiicon@open-access-square\endcsname{\symbol{"E839}} \def\aiOpenAccessSquare{{\AI\csname% aiicon@open-access-square\endcsname}} \expandafter\def\csname% - aiicon@coursera\endcsname{\symbol{"E924}} -\def\aiCoursera{{\AI\csname% - aiicon@coursera\endcsname}} + aiicon@orcid\endcsname{\symbol{"E840}} +\def\aiOrcid{{\AI\csname% + aiicon@orcid\endcsname}} \expandafter\def\csname% - aiicon@coursera-square\endcsname{\symbol{"E925}} -\def\aiCourseraSquare{{\AI\csname% - aiicon@coursera-square\endcsname}} + aiicon@orcid-square\endcsname{\symbol{"E841}} +\def\aiOrcidSquare{{\AI\csname% + aiicon@orcid-square\endcsname}} \expandafter\def\csname% - aiicon@osf\endcsname{\symbol{"E926}} -\def\aiOsf{{\AI\csname% + aiicon@osf\endcsname{\symbol{"E842}} +\def\aiOSF{{\AI\csname% aiicon@osf\endcsname}} \expandafter\def\csname% - aiicon@osf-square\endcsname{\symbol{"E927}} -\def\aiOsfSquare{{\AI\csname% + aiicon@osf-square\endcsname{\symbol{"E843}} +\def\aiOSFSquare{{\AI\csname% aiicon@osf-square\endcsname}} \expandafter\def\csname% - aiicon@doi\endcsname{\symbol{"E928}} -\def\aiDoi{{\AI\csname% - aiicon@doi\endcsname}} + aiicon@overleaf\endcsname{\symbol{"E844}} +\def\aiOverleaf{{\AI\csname% + aiicon@overleaf\endcsname}} \expandafter\def\csname% - aiicon@doi-square\endcsname{\symbol{"E929}} -\def\aiDoiSquare{{\AI\csname% - aiicon@doi-square\endcsname}} + aiicon@overleaf-square\endcsname{\symbol{"E845}} +\def\aiOverleafSquare{{\AI\csname% + aiicon@overleaf-square\endcsname}} \expandafter\def\csname% - aiicon@inspire\endcsname{\symbol{"E930}} -\def\aiInspire{{\AI\csname% - aiicon@inspire\endcsname}} + aiicon@philpapers\endcsname{\symbol{"E846}} +\def\aiPhilPapers{{\AI\csname% + aiicon@philpapers\endcsname}} \expandafter\def\csname% - aiicon@inspire-square\endcsname{\symbol{"E931}} -\def\aiInspireSquare{{\AI\csname% - aiicon@inspire-square\endcsname}} + aiicon@philpapers-square\endcsname{\symbol{"E847}} +\def\aiPhilPapersSquare{{\AI\csname% + aiicon@philpapers-square\endcsname}} \expandafter\def\csname% - aiicon@pubmed\endcsname{\symbol{"E932}} + aiicon@piazza\endcsname{\symbol{"E848}} +\def\aiPiazza{{\AI\csname% + aiicon@piazza\endcsname}} +\expandafter\def\csname% + aiicon@piazza-square\endcsname{\symbol{"E849}} +\def\aiPiazzaSquare{{\AI\csname% + aiicon@piazza-square\endcsname}} + +\expandafter\def\csname% + aiicon@publons\endcsname{\symbol{"E850}} +\def\aiPublons{{\AI\csname% + aiicon@publons\endcsname}} +\expandafter\def\csname% + aiicon@publons-square\endcsname{\symbol{"E851}} +\def\aiPublonsSquare{{\AI\csname% + aiicon@publons-square\endcsname}} + +\expandafter\def\csname% + aiicon@pubmed\endcsname{\symbol{"E852}} \def\aiPubMed{{\AI\csname% aiicon@pubmed\endcsname}} \expandafter\def\csname% - aiicon@pubmed-square\endcsname{\symbol{"E933}} + aiicon@pubmed-square\endcsname{\symbol{"E853}} \def\aiPubMedSquare{{\AI\csname% aiicon@pubmed-square\endcsname}} \expandafter\def\csname% - aiicon@acclaim\endcsname{\symbol{"E934}} -\def\aiAcclaim{{\AI\csname% - aiicon@acclaim\endcsname}} + aiicon@researchgate\endcsname{\symbol{"E854}} +\def\aiResearchGate{{\AI\csname% + aiicon@researchgate\endcsname}} \expandafter\def\csname% - aiicon@acclaim-square\endcsname{\symbol{"E935}} -\def\aiAcclaimSquare{{\AI\csname% - aiicon@acclaim-square\endcsname}} + aiicon@researchgate-square\endcsname{\symbol{"E855}} +\def\aiResearchGateSquare{{\AI\csname% + aiicon@researchgate-square\endcsname}} + +% \expandafter\def\csname% +% aiicon@researchgateold\endcsname{\symbol{"E602}} +% \def\aiResearchGateOld{{\AI\csname% +% aiicon@researchgateold\endcsname}} +% \expandafter\def\csname% +% aiicon@researchgateold-square\endcsname{\symbol{"E603}} +% \def\aiResearchGateOldSquare{{\AI\csname% +% aiicon@researchgateold-square\endcsname}} + +\expandafter\def\csname% + aiicon@scirate\endcsname{\symbol{"E856}} +\def\aiSciRate{{\AI\csname% + aiicon@scirate\endcsname}} +\expandafter\def\csname% + aiicon@scirate-square\endcsname{\symbol{"E857}} +\def\aiSciRateSquare{{\AI\csname% + aiicon@scirate-square\endcsname}} + +\expandafter\def\csname% + aiicon@springer\endcsname{\symbol{"E858}} +\def\aiSpringer{{\AI\csname% + aiicon@springer\endcsname}} +\expandafter\def\csname% + aiicon@springer-square\endcsname{\symbol{"E859}} +\def\aiSpringerSquare{{\AI\csname% + aiicon@springer-square\endcsname}} + +\expandafter\def\csname% + aiicon@zotero\endcsname{\symbol{"E860}} +\def\aiZotero{{\AI\csname% + aiicon@zotero\endcsname}} +\expandafter\def\csname% + aiicon@zotero-square\endcsname{\symbol{"E861}} +\def\aiZoteroSquare{{\AI\csname% + aiicon@zotero-square\endcsname}} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/academicons.tlpobj new/tlpkg/tlpobj/academicons.tlpobj --- old/tlpkg/tlpobj/academicons.tlpobj 2016-05-17 03:15:32.000000000 +0200 +++ new/tlpkg/tlpobj/academicons.tlpobj 2017-05-17 02:22:03.000000000 +0200 @@ -1,27 +1,32 @@ name academicons category Package -revision 41194 -shortdesc Font containing icons of online academic profiles +revision 44380 +shortdesc Font containing high quality icons of online academic profiles relocated 1 -longdesc This package provides access in (La)TeX to 20 high quality +longdesc This package provides access in (La)TeX to 36 high quality longdesc icons of online academic profiles included in the free longdesc "Academicons" font. It requires the fontspec package and either -longdesc the Xe(La)TeX or the Lua(La)TeX engine to load the included -longdesc academicons.ttf font. The "Academicons" font was designed by -longdesc James Walsh and released (see -longdesc http://jpswalsh.github.io/academicons/) under the SIL Open Font -longdesc License. This package is inspired by and based on the -longdesc fontawesome package. academicons.sty provides the generic -longdesc \aiicon command to access icons, which takes as a mandatory -longdesc argument the name of the desired icon. It also provides -longdesc individual direct commands for each specific icon. The full -longdesc list of icons and their respective names and direct commands -longdesc can be found in the manual. -runfiles size=9 +longdesc the Xe(La)TeX or the Lua(La)TeX engine to load "Academicons" +longdesc font from the system, which requires installing the bundled +longdesc academicons.ttf font file. As new releases come out, it is +longdesc recommended to install the bundled font version as there may be +longdesc differences between the package and previous font versions or +longdesc newer font versions not yet contemplated in the package. The +longdesc "Academicons" font was designed by James Walsh and released +longdesc (see http://jpswalsh.github.io/academicons/) under the SIL Open +longdesc Font License. This package is a redistribution of the free +longdesc "Academicons" font with specific bindings for (La)TeX. It is +longdesc inspired by and based on the fontawesome package. +longdesc academicons.sty provides the generic \aiicon command to access +longdesc icons, which takes as a mandatory argument the name of the +longdesc desired icon. It also provides individual direct commands for +longdesc each specific icon. The full list of icons and their respective +longdesc names and direct commands can be found in the manual. +runfiles size=13 RELOC/fonts/truetype/public/academicons/academicons.ttf RELOC/tex/latex/academicons/academicons.sty catalogue-ctan /fonts/academicons -catalogue-date 2016-05-16 16:14:19 +0200 +catalogue-date 2017-05-15 23:55:24 +0200 catalogue-license lppl1.3 catalogue-topics font font-supp-symbol font-symbol font-ttf -catalogue-version 1.7.0 +catalogue-version 1.8.0 ++++++ accanthis.doc.tar.xz ++++++ ++++++ accanthis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/accanthis.tlpobj new/tlpkg/tlpobj/accanthis.tlpobj --- old/tlpkg/tlpobj/accanthis.tlpobj 2016-04-14 18:32:47.000000000 +0200 +++ new/tlpkg/tlpobj/accanthis.tlpobj 2017-04-14 17:26:54.000000000 +0200 @@ -92,6 +92,6 @@ RELOC/tex/latex/accanthis/TS1AccanthisADFStdNoThree-LF.fd RELOC/tex/latex/accanthis/accanthis.sty catalogue-ctan /fonts/accanthis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font font-serif font-type1 font-otf ++++++ accfonts.doc.tar.xz ++++++ ++++++ accfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/accfonts.tlpobj new/tlpkg/tlpobj/accfonts.tlpobj --- old/tlpkg/tlpobj/accfonts.tlpobj 2016-04-14 18:32:48.000000000 +0200 +++ new/tlpkg/tlpobj/accfonts.tlpobj 2017-04-14 17:26:55.000000000 +0200 @@ -27,7 +27,7 @@ texmf-dist/tex/latex/accfonts/Norman.def catalogue-also a2ac catalogue-ctan /fonts/utilities/accfonts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font-proc omega catalogue-version 0.25 ++++++ achemso.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/achemso/README.txt new/doc/latex/achemso/README.txt --- old/doc/latex/achemso/README.txt 2016-01-20 23:42:33.000000000 +0100 +++ new/doc/latex/achemso/README.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -achemso - Support for submissions to American Chemical Society journals -======================================================================= - -The `achemso` bundle provides a LaTeX class file and BibTeX -style file in accordance with the requirements of the American -Chemical Society (ACS). The files can be used for any documents, -but have been carefully designed and tested to be suitable for -submission to ACS journals. - -The bundle also includes the `natmove` package. This package is -loaded by `achemso`, and provides automatic moving of -superscript citations after punctuation. - -Installation ------------- - -The package is supplied in `.dtx` format and as a pre-extracted -`.zip` file, `achemso.tds.zip`. The later is most convenient for -most users: simply unzip this in your local `texmf` directory. -If you want to unpack the `.dtx` yourself, running `tex -achemso.dtx` will extract the package whereas `latex -achemso.dtx` will extract it and also typeset the documentation. - -Typesetting the documentation requires a number of packages in -addition to those needed to use the package. This is mainly -because of the number of demonstration items included in the -text. To compile the documentation without error, you will -need the packages: - - `array` - - `booktabs` - - `hypdoc` - - `listings` - - `lmodern` - - `mathpazo` - - `microtype` - Binary files old/doc/latex/achemso/achemso-demo.pdf and new/doc/latex/achemso/achemso-demo.pdf differ Binary files old/doc/latex/achemso/achemso.pdf and new/doc/latex/achemso/achemso.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/achemso.doc.tlpobj new/tlpkg/tlpobj/achemso.doc.tlpobj --- old/tlpkg/tlpobj/achemso.doc.tlpobj 2016-05-12 03:16:09.000000000 +0200 +++ new/tlpkg/tlpobj/achemso.doc.tlpobj 2017-05-19 23:41:20.000000000 +0200 @@ -1,12 +1,11 @@ name achemso.doc category Package -revision 41037 +revision 44425 shortdesc doc files of achemso relocated 1 -docfiles size=225 +docfiles size=224 RELOC/doc/latex/achemso/LICENSE.md RELOC/doc/latex/achemso/README.md - RELOC/doc/latex/achemso/README.txt RELOC/doc/latex/achemso/achemso-demo.bib RELOC/doc/latex/achemso/achemso-demo.pdf RELOC/doc/latex/achemso/achemso-demo.tex ++++++ achemso.tar.xz ++++++ ++++ 1792 lines of diff (skipped) ++++++ acmart.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-a/acmart.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-a.new/acmart.doc.tar.xz differ: char 26, line 1 ++++++ acmart.tar.xz ++++++ ++++ 26390 lines of diff (skipped) ++++++ acmconf.doc.tar.xz ++++++ ++++++ acmconf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acmconf.tlpobj new/tlpkg/tlpobj/acmconf.tlpobj --- old/tlpkg/tlpobj/acmconf.tlpobj 2016-04-14 18:32:50.000000000 +0200 +++ new/tlpkg/tlpobj/acmconf.tlpobj 2017-04-14 17:26:59.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/acmconf/acmconf.cls catalogue-ctan /macros/latex/contrib/acmconf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics confproc journalpub class catalogue-version 1.3 ++++++ acro.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acro/README new/doc/latex/acro/README --- old/doc/latex/acro/README 2016-05-04 00:18:53.000000000 +0200 +++ new/doc/latex/acro/README 2017-02-11 01:01:03.000000000 +0100 @@ -1,15 +1,15 @@ -------------------------------------------------------------------------- -the ACRO package v2.4b +the ACRO package v2.7a Typeset Acronyms -2016/05/03 +2017/02/09 -------------------------------------------------------------------------- Clemens Niederberger -Web: http://www.mychemistry.eu/forums/forum/acro/ +Web: https://bitbucket.org/cgnieder/acro E-Mail: contact(a)mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012--2016 Clemens Niederberger +Copyright 2012--2017 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 Binary files old/doc/latex/acro/acro_en.pdf and new/doc/latex/acro/acro_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acro/acro_en.tex new/doc/latex/acro/acro_en.tex --- old/doc/latex/acro/acro_en.tex 2016-05-04 00:18:53.000000000 +0200 +++ new/doc/latex/acro/acro_en.tex 2017-02-11 01:01:03.000000000 +0100 @@ -13,7 +13,7 @@ % Web: http://www.mychemsitry.eu/forums/forum/acro/ % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2016 Clemens Niederberger +% Copyright 2011-2017 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,25 +39,29 @@ \usepackage[single,macros,accsupp,index]{acro} \setcnltx{ package = {acro} , + info = {Typeset Acronyms and other Abbreviations} , authors = Clemens Niederberger , email = contact(a)mychemistry.eu , url = https://bitbucket.org/cgnieder/acro/ , abstract = {% - \acro\ not only allows you to create acronyms in a simple way but also lets - you add them to different classes of acronyms. Lists can be created of - separate classes wherever you want the list to appear.\par - \acro\ also provides an option \option{single} which ignores acronyms that are - used only once in the whole document.\par + \acro\ allows you to define and use abbreviations in a simple way. + Abbreviations can be divided into different classes of abbreviations. + Lists of abbreviations can be created (also of separate classes of + abbreviations) and printed wherever you want the lists to appear.\par + \acro\ provides an option \option{single} which ignores abbreviations that + are used only once in the whole document.\par As an experimental feature \acro\ also offers the option \option{sort} which - automatically sorts the list created by \cs{printacronyms}.% + automatically sorts the list created by \cs{printacronyms}.\par + \acro\ also has the feature of creating \emph{local} lists } , add-cmds = { ac, Ac, aca, Aca, acap, Acap, acbarrier, acdot, acf, Acf, acflike, acg, acfp, Acfp, acfplike, aciftrailing, acl, Acl, aclp, Aclp, acp, Acp, AcroRegisterTrailing, acs, Acs, acsingle, Acsingle, acsp, Acsp, acspace, acreset, acresetall, acsetup, - DeclareAcroCommand, DeclareAcronym, DeclareAcroListHeading, - DeclareAcroListStyle, DeclarePseudoAcroCommand, + DeclareAcroCommand, DeclareAcronym, DeclareAcroExtraStyle, + DeclareAcroFirstStyle, DeclareAcroListHeading, + DeclareAcroListStyle, DeclareAcroPageStyle, DeclarePseudoAcroCommand, iac, Iac, iaca, Iaca, iacs, Iacs, iacl, Iacl, iacf, Iacf, iacflike, Iacflike, NewAcroCommand, NewPseudoAcroCommand, @@ -72,7 +76,11 @@ index-setup = { level = \section , headers={\indexname}{\indexname} } } -\acsetup{hyperref} +\acsetup{ + use-barriers = true , + hyperref = true , + log +} \usepackage{varioref} @@ -119,51 +127,6 @@ \textsc{Wikipedia}} \newcommand*\h[1]{\textcolor{cnltx}{\textbf{#1}}} -\makeatletter -\def\cnltx@bash@listings@style{ - language = bash, - basicstyle = {\sourceformat\color{black}}, - % numbers = left, - % numberstyle = \tiny, - xleftmargin = 1em, - numbersep = .75em, - gobble = \cnltx@gobble , - columns = fullflexible, - literate = - {ä}{{\"a}}1 - {ö}{{\"o}}1 - {ü}{{\"u}}1 - {Ä}{{\"A}}1 - {Ö}{{\"O}}1 - {Ü}{{\"U}}1 - {ß}{{\ss}}1 , - breaklines = true, - keepspaces = true, - breakindent = 1em, - commentstyle = \color{comment}, - keywordstyle = \color{black}\bfseries , - stringstyle = \color{black} , - showstringspaces = false , - morekeywords = texdoc -} - -\cnltx@expandargs(nx)\lstdefinestyle - {bash} - {\expandonce\cnltx@bash@listings@style} - -\newcommand*\prompt{} -\patchcmd\lst@NewLine - {\hbox{}}% search - {\hbox{}\prompt}% replace - {}% success - {}% failure -\newsourcecodeenv[ - code-only, - sourcecode-options={style=bash}, - pre-code=\def\prompt{\textasciitilde\space\$\space} -]{bash} -\makeatother - \ProvideAcroEnding {possessive} {'s} {'s} % declare acronyms @@ -199,6 +162,7 @@ \DeclareAcronym{jpg} { short = JPEG , + sort = jpeg , alt = JPG , long = Joint Photographic Experts Group } @@ -313,7 +277,7 @@ \section{Basics} \subsection{Creating New Acronyms} -Acronyms\changedversion{1.0} are created with the command \cs{DeclareAcronym}. +Acronyms are created with the command \cs{DeclareAcronym}. \begin{commands} \command{DeclareAcronym}[\marg{id}\marg{list of keys}] The basic command for declaring an acronym. @@ -324,70 +288,70 @@ \begin{options} %% short \keyval{short}{text}\Default! - the short form of the acronym. This option is required: an acronym must + The short form of the acronym. This option is required: an acronym must have a short form. If this is set it \emph{must} be set as first option! If another option is set first and notices the \option{short} option missing it assumes that the \acs{id} should be used as short version and sets it accordingly. A warning will be written to the log then. %% long \keyval{long}{text}\Default! - the long form of the acronym. This option is required: an acronym must + The long form of the acronym. This option is required: an acronym must have a description. %% short-plural \keyval{short-plural}{text}\Default{s} - the plural ending appended to the short form. + The plural ending appended to the short form. %% short-plural-form \keyval{short-plural-form}{text} - the\sinceversion{2.0}plural short form of the acronym; replaces the short + The\sinceversion{2.0} plural short form of the acronym; replaces the short form when used instead of appending the plural ending. %% long-plural \keyval{long-plural}{text}\Default{s} - the plural ending appended to the long form. + The plural ending appended to the long form. %% long-plural-form \keyval{long-plural-form}{text} - plural long form of the acronym; replaces the long form when used + Plural long form of the acronym; replaces the long form when used instead of appending the plural ending. %% alt-plural \keyval{alt-plural}{text}\Default{s} - the\sinceversion{2.0} plural ending appended to the alternative form. + The\sinceversion{2.0} plural ending appended to the alternative form. %% alt-plural-form \keyval{alt-plural-form}{text} - the\sinceversion{2.0}plural alternative form of the acronym; replaces the + The\sinceversion{2.0} plural alternative form of the acronym; replaces the alternative form when used instead of appending the plural ending. %% list \keyval{list}{text} - \sinceversion{1.4}if specified this will be written in the list as - description instead of the long form. + If specified this will be written in the list as description instead of + the long form. %% short-indefinite \keyval{short-indefinite}{text}\Default{a} - \sinceversion{1.2}indefinite article for the short form. + Indefinite article for the short form. %% long-indefinite \keyval{long-indefinite}{text}\Default{a} - \sinceversion{1.2}indefinite article for the long form. + Indefinite article for the long form. %% long-pre \keyval{long-pre}{text} - \sinceversion{1.1}\meta{text} is prepended to the long form in the text - but not in the list of acronyms. + \meta{text} is prepended to the long form in the text but not in the list + of acronyms. %% long-post \keyval{long-post}{text} - \sinceversion{1.1}\meta{text} is appended to the long form in the text but - not in the list of acronyms. + \meta{text} is appended to the long form in the text but not in the list + of acronyms. %% alt \keyval{alt}{text} - alternative short form. + Alternative short form. %% alt-indefinite \keyval{alt-indefinite}{text}\Default{a} - \sinceversion{1.2}indefinite article for the alternative form. + Indefinite article for the alternative form. %% extra \keyval{extra}{text} - extra information to be added in the list of acronyms. + Extra information to be added in the list of acronyms. %% foreign \keyval{foreign}{original long form} - \sinceversion{1.3}can be useful when dealing with acronyms in foreign - languages, see section~\vref{ssec:foreign} for details. + Can be useful when dealing with acronyms in foreign languages, see + section~\vref{ssec:foreign} for details. %% foreign-lang \keyval{foreign-lang}{language} - \sinceversion{2.3}the \pkg{babel}~\cite{pkg:babel} or + \sinceversion{2.3}The \pkg{babel}~\cite{pkg:babel} or \pkg{polyglossia}~\cite{pkg:polyglossia} language of the foreign form. This language is used to wrap the entry with \cs*{foreignlanguage}\marg{language} if either \pkg{babel} or @@ -395,70 +359,70 @@ corresponding language is loaded by \pkg{babel} or \pkg{polyglossia}. %% single \keyval{single}{text} - \sinceversion{2.3}if provided \meta{text} will be used instead of the long + \sinceversion{2.3}If provided \meta{text} will be used instead of the long form if the acronym is only used a single time \emph{and} the option \keyis{single}{true} is active. %% sort \keyval{sort}{text} - if used the acronym will be sorted according to this key instead of its + If used the acronym will be sorted according to this key instead of its \acs{id}. %% class \keyval{class}{csv list} - the\changedversion{2.4} class(es) the acronym belongs to. + The\changedversion{2.4} class(es) the acronym belongs to. %% cite \keylit{cite}{\oarg{prenote}\oarg{postnote}\marg{citation keys}} - a citation that is printed to the acronym according to an option explained + A citation that is printed to the acronym according to an option explained later. %% short-format \keyval{short-format}{\TeX{} code} - the format used for the short form of the acronym. + The format used for the short form of the acronym. %% long-format \keyval{long-format}{\TeX{} code} - the format used for the long form of the acronym. + The format used for the long form of the acronym. %% first-long-format \keyval{first-long-format}{\TeX{} code} - the format used for the first long form of the acronym as set with \cs{ac}, + The format used for the first long form of the acronym as set with \cs{ac}, \cs{acf} or \cs{acflike} and their uppercase, plural and indefinite forms. %% single-format \keyval{single-format}{\TeX{} code} - \sinceversion{2.3}the format used for the acronym if the acronym is only + \sinceversion{2.3}The format used for the acronym if the acronym is only used a single time. %% first-style - \keychoice{first-style}{default,empty,square,short,long,reversed,footnote,sidenote} - \sinceversion{2.3}the style of the first appearance of the acronym, see + \keychoice{first-style}{default,empty,square,short,long,reversed,footnote,sidenote,% + footnote-reversed,sidenote-reversed} + \sinceversion{2.3}The style of the first appearance of the acronym, see also section~\ref{sec:opti-regard-acronyms}. %% pdfstring \keylit{pdfstring}{\meta{text}/\meta{plural ending}} - \changedversion{2.4b}used as \acs{pdf} string replacement in bookmarks + \changedversion{2.4b}Used as \acs{pdf} string replacement in bookmarks when used together with the \pkg{hyperref} package. The appended plural ending is optional. If you leave it (\emph{and} the \code{/}) the default ending is used. \meta{text} is expanded before it is saved. %% accsupp \keyval{accsupp}{text} - sets the \code{ActualText} key as presented by the \pkg{accsupp} package + Sets the \code{ActualText} key as presented by the \pkg{accsupp} package for the acronym. %% tooltip \keyval{tooltip}{text} - \sinceversion{2.1}sets the tooltip description for an acronym. For + \sinceversion{2.1}Sets the tooltip description for an acronym. For actually getting tooltips you also need an appropriate setting of the \option{tooltip-cmd} option or to set the package option \option{tooltip}. %% index-sort \keyval{index-sort}{text} - \sinceversion{1.1}If you use the package option \option{index} every - occurrence of an acronym is recorded to the index and sorted by its - \acs{id} or (if set) by the value of the \option{sort} key. This key - allows to set an individual sorting option for the index. See - section~\vref{ssec:index} for details. + If you use the package option \option{index} every occurrence of an + acronym is recorded to the index and sorted by its \acs{id} or (if set) by + the value of the \option{sort} key. This key allows to set an individual + sorting option for the index. See section~\vref{ssec:index} for details. %% index \keyval{index}{text} - \sinceversion{1.1}This key allows to overwrite the automatic index entry - with an arbitrary one. See section~\vref{ssec:index} for details. + This key allows to overwrite the automatic index entry with an arbitrary + one. See section~\vref{ssec:index} for details. %% index-cmd \keyval{index-cmd}{control sequence} - \sinceversion{1.1}This key let's you set an individual index creating - command for this acronym. It should be a command that takes one mandatory - argument. See section~\vref{ssec:index} for details. + This key let's you set an individual index creating command for this + acronym. It should be a command that takes one mandatory argument. See + section~\vref{ssec:index} for details. \end{options} In its simplest form an acronym needs a short and a long form. Please note @@ -514,6 +478,35 @@ The first appearance now looks as follows\footnote{The appearance of the citation of course depends on the citation style you're using.}: \acf{ny}. +\subsection{Logging of Acronyms} +When you activate \acro's option\sinceversion{2.5} \option{log} \acro' writes +information about the acronyms it defines to the log file. +\begin{options} + \keychoice{log}{\default{true},false,silent,verbose}\Default{false} + When set to \code{true}/\code{silent} \acro{} writes the main properties + of an acronym to the log file. When set to \code{verbose} \acro' writes + \emph{all} properties of an acronym to the log file. +\end{options} + +This is an example of the logging info with \keyis{log}{true} or +\keyis{log}{silent}. +\begin{sourcecode} + ================================================= + | acro info -- defining new acronym: + | ID = {jpg} + | short = {JPEG} + | long = {Joint Photographic Experts Group} + | alt = {JPG} + | sort = {jpeg} + | class = {} + | list = {} + | extra = {} + | foreign = {} + | pdfstring = {} + | cite = {} + ================================================= +\end{sourcecode} + \subsection{Using the Acronyms -- the Commands}\label{sec:using-acronyms-comm} Acronyms are used with one of the following commands: \begin{commands} @@ -557,10 +550,9 @@ been used with \emph{any} of the output commands before it is \emph{not} the first time any more. -\sinceversion{0.5}If you use the starred variant an acronym will not be marked -as used. This proves useful if an acronym is typeset in a section title, for -example, since then the appearance in the table of contents won't mark it as -used. +If you use the starred variant an acronym will not be marked as used. This +proves useful if an acronym is typeset in a section title, for example, since +then the appearance in the table of contents won't mark it as used. \begin{example}[side-by-side] % preamble: @@ -643,6 +635,7 @@ % preamble: % \DeclareAcronym{jpg}{ % short = JPEG , + % sort = jpeg , % alt = JPG , % long = Joint Photographic Experts Group % } @@ -679,10 +672,9 @@ \end{example} \subsection{Foreign Language Acronyms}\label{ssec:foreign} -\noindent\sinceversion{1.3}I repeatedly read the wish for being able to add -translations to acronyms when the acronyms stem from another language than the -document language, \latin{i.e.}, something like the following in a German -document: +I repeatedly read the wish for being able to add translations to acronyms when +the acronyms stem from another language than the document language, +\latin{i.e.}, something like the following in a German document: \begin{example}[side-by-side] \ac{ecu}\\ \ac{ecu} @@ -721,7 +713,7 @@ \section{Additional Commands and Possibilities} \subsection{Indefinite Forms} -\noindent\sinceversion{1.2}% + Unlike many other languages\footnote{Let's better say: unlike the other languages where I know at least the basics.} in English the indefinite article is not determined by the grammatical case, gender or number but by the @@ -746,18 +738,17 @@ \subsection{Uppercasing} \begin{commands} \command{acfirstupper}[\marg{token list}] - \sinceversion{1.3e}This command uppercases the first token in \meta{token - list}. The command is less powerful than \cs{makefirstuc} that is - provided by the \pkg{mfirstuc} package~\cite{pkg:mfirstuc} but it is - expandable. Obvious downsides are for example that it does not uppercase - accented letters. + This command uppercases the first token in \meta{token list}. The + command is less powerful than \cs{makefirstuc} that is provided by the + \pkg{mfirstuc} package~\cite{pkg:mfirstuc} but it is expandable. Obvious + downsides are for example that it does not uppercase accented letters. \end{commands} \subsection{Simulating the First Appearance}\label{sec:simul-first-appe} -Users\sinceversion{1.2} told me\footnote{Well -- one, to be precise ;)} that -there are cases when it might be useful to have the the acronym typeset -according to the \option{first-style} but with another text than the long -form. For such cases \acro\ offers the following commands. +Users told me\footnote{Well -- one, to be precise ;)} that there are cases +when it might be useful to have the the acronym typeset according to the +\option{first-style} but with another text than the long form. For such cases +\acro\ offers the following commands. \begin{commands} \command{acflike}[\sarg\marg{id}\marg{instead of long form}] Write some alternative long form for acronym with \acs{id} \meta{id} as if @@ -833,16 +824,15 @@ used for the first time you can call one of these commands: \begin{commands} \command{acreset}[\marg{comma separated list of ids}] - \sinceversion{0.5}This will reset a used acronym such that the next use of - \cs{ac} will again print it as if it were used the first time. This will - \emph{not} remove an acronym from being printed in the list if it actually - \emph{has} been used before. + This will reset a used acronym such that the next use of \cs{ac} will + again print it as if it were used the first time. This will \emph{not} + remove an acronym from being printed in the list if it actually \emph{has} + been used before. \command{acresetall} Reset all acronyms. \command{acifused}[\marg{id}\marg{true}\marg{false}] - \sinceversion{1.3e}This command tests if the acronym with \ac{id} - \meta{id} has already been used and either puts \code{true} or - \code{false} in the input stream. + This command tests if the acronym with \ac{id} \meta{id} has already been + used and either puts \code{true} or \code{false} in the input stream. \end{commands} \begin{example}[side-by-side] \acreset{ny}\ac{ny} @@ -852,12 +842,23 @@ used: \begin{commands} \command{acuse}[\marg{comma separated list of ids}] - \sinceversion{0.5}This has the same effect as if an acronym had been used - twice, that is, further uses of \cs{ac} will print the short form and the - acronym will in any case be printed in the list (as long as its class is - not excluded). + This has the same effect as if an acronym had been used twice, that is, + further uses of \cs{ac} will print the short form and the acronym will in + any case be printed in the list (as long as its class is not excluded). \command{acuseall} - \sinceversion{0.6a}Mark all acronyms as used. + Mark all acronyms as used. +\end{commands} +Then there are two further commands related to using acronyms: +\begin{commands} + \command{acswitchoff} + This\sinceversion{2.6} command is for patching in certain situations. For + example some table environments like \env*{tabularx} or \env*{tabu} pass + their content two or more times for determining the width of the table + columns. Those can be patched to add \cs{acswitchoff} to their trial + phase. + \command{acswitchon} + Effectively\sinceversion{2.6} the opposite of \cs{acswitchoff} -- this + command should probably never be needed. \end{commands} \subsection{\cs*{ac} and Friends in \acs*{pdf} Bookmarks, Accessibility @@ -869,11 +870,11 @@ the point of having macros to get output for you if you have to specify it manually after all? -That is why \acro\ offers\sinceversion{0.5} a preliminary solution for this. -In a bookmark every \cs{ac} like command falls back to a simple text string -typesetting what \cs{acs} would do (or \cs{acsp} for plural forms). These -text strings both can accessed manually and can be modified to an output -reserved for \acs{pdf} bookmarks. +That is why \acro\ offers a preliminary solution for this. In a bookmark +every \cs{ac} like command falls back to a simple text string typesetting what +\cs{acs} would do (or \cs{acsp} for plural forms). These text strings both +can accessed manually and can be modified to an output reserved for \acs{pdf} +bookmarks. \begin{commands} \command{acpdfstring}[\marg{id}] @@ -916,10 +917,10 @@ \begin{options} \keyval{accsupp}{text} - \sinceversion{1.0}Key for \cs{DeclareAcronym} to set the \code{ActualText} - property of \cs*{BeginAccSupp} (see \pkg{accsupp}'s documentation for - details) to be used for an acronym. It only has an effect when the - package option \option{accsupp} is used, too. + Key for \cs{DeclareAcronym} to set the \code{ActualText} property of + \cs*{BeginAccSupp} (see \pkg{accsupp}'s documentation for details) to be + used for an acronym. It only has an effect when the package option + \option{accsupp} is used, too. \end{options} \subsubsection{Tooltips} @@ -950,9 +951,9 @@ ``inner'' acronyms are disabled. \subsection{Adding Acronyms to the Index}\label{ssec:index} -\noindent\sinceversion{1.1}\acro\ has the package option \option{index}. If it is -used an index entry will be recorded every time an \emph{unstarred} acronym -command is used. The index entry will be \code{\meta{id}@\meta{short}}, +\acro\ has the package option \option{index}. If it is used an index entry +will be recorded every time an \emph{unstarred} acronym command is used. The +index entry will be \code{\meta{id}@\meta{short}}, \code{\meta{sort}@\meta{short}} if the \option{sort} key has been set, \code{\meta{index-sort}@\meta{short}} if the \option{index-sort} has been set, or \meta{index} if the key \option{index} has been set for the specific @@ -970,8 +971,8 @@ appreciate an email. \section{Printing the List}\label{sec:print_lists} -\noindent\changedversion{1.0}Printing the whole list of acronyms is easy: just -place \cs{printacronyms} where ever you want the list to be. +Printing the whole list of acronyms is easy: just place \cs{printacronyms} +where ever you want the list to be. \begin{commands} \command{printacronyms}[\oarg{options}] Print the list of acronyms. @@ -983,15 +984,17 @@ the list. \keyval{exclude-classes}{list of classes} Takes a comma-separated list of the classes of acronyms that should - \emph{not} be in the list. + \emph{not} be in the list. \emph{Note that this list overwrites any + entries in \option{include-classes}!} If a class is both included and + excluded then the corresponding acronyms will not be added to the list. \keyval{name}{name of the list} sets the name for the list. \keyval{heading}{sectioning command without leading backslash}% \Default{section*} - \changedversion{1.3}Sets the sectioning command for the heading of the - list. A special value is \code{none} which suppresses the heading. + Sets the sectioning command for the heading of the list. A special value + is \code{none} which suppresses the heading. \keybool{sort}\Default{true} - \sinceversion{1.3}Set sorting for this list only. + Set sorting for this list only. \keybool{local-to-barriers}\Default{false} This\sinceversion{2.4} option can be used to create a list of only the acronyms of the current \enquote{barrier group}, see @@ -1024,17 +1027,16 @@ % prior to v1.0. %% \keychoice{messages}{silent,loud}\Default{loud} - \sinceversion{1.6}Setting \keyis{messages}{silent} will turn all of - \acro's error messages into warnings and all of \acro's warnings into info - messages. Be sure to check the log file carefully if you decide to set - this option. + Setting \keyis{messages}{silent} will turn all of \acro's error messages + into warnings and all of \acro's warnings into info messages. Be sure to + check the log file carefully if you decide to set this option. \keybool{single}\Default{false} If set to \code{true} an acronym that's used only once (with \cs{ac}) in a document will only print the acronym in a specified form and will not be printed in the list. %% \keychoice{single-form}{long,short,alt,first}\Default{long} - \sinceversion{2.}Determines how a single appearance of an acronym is + \sinceversion{2.0}Determines how a single appearance of an acronym is printed if \keyis{single}{true} has been chosen. %% \keybool{hyperref}\Default{false} @@ -1042,21 +1044,13 @@ their list entry. %% \keybool{label}\Default{false} - \sinceversion{1.5}If set to \code{true} this option will place + If set to \code{true} this option will place \cs*{label}\Marg{\meta{prefix}\meta{id}} the first time the acronym with - \ac{id} \meta{id} is used. + \ac{id} \meta{id} is used. %% \keyval{label-prefix}{text}\Default{ac:} - \sinceversion{1.5}The prefix for the \cs*{label} that is placed when - option \keyis{label}{true} is used. - %% - \keybool{record-pages}\Default{true} - Since \acro\ can handle arabic, roman and Roman page numbers but - \emph{not} any other kind of numbering this option allows to turn the page - number recording off for these cases as it would lead to errors else. - This affects the whole document and can only be set in the preamble! It - means you cannot have page numbers in the list of acronyms in this case. - Or rather: you can if you use \keyis{pages}{first}. + The prefix for the \cs*{label} that is placed when option + \keyis{label}{true} is used. %% \keybool{only-used}\Default{true} This option is \code{true} as default. It means that only acronyms that @@ -1065,7 +1059,6 @@ written to the list. %% \keychoice{mark-as-used}{first,any}\Default{any} - \sinceversion{1.2}% This option determines wether an acronym is mark as used when the \emph{first} form is used the first time (with \cs{ac}, \cs{acf} or \cs{acflike} and their uppercase, plural and indefinite forms) or when any @@ -1077,9 +1070,9 @@ will \emph{not} be overwritten. %% \keybool{xspace}\Default{false} - \sinceversion{0.6}If set to \code{true} this option will append - \cs*{xspace} from the \pkg*{xspace} package to the commands created with - the \option{macros} option. + If set to \code{true} this option will append \cs*{xspace} from the + \pkg*{xspace} package to the commands created with the \option{macros} + option. %% \keybool{strict}\Default{false} If set to \code{true} and the option \keyis{macros}{true} is in effect @@ -1120,17 +1113,15 @@ key as argument is valid, for example \pkg*{biblatex}'s \cs*{footcite}. %% \keybool{index}\Default{false} - \sinceversion{1.1}If set to \code{true} an index entry will be recorded - every time an \emph{unstarred} acronym command is used for the - corresponding acronym. + If set to \code{true} an index entry will be recorded every time an + \emph{unstarred} acronym command is used for the corresponding acronym. %% \keyval{index-cmd}{control sequence}\Default{\cs*{index}} - \sinceversion{1.1}Chooses the index command that is used when option - \option{index} has been set to \code{true}. + Chooses the index command that is used when option \option{index} has been + set to \code{true}. %% \keybool{accsupp}\Default{false} - \sinceversion{1.0}Activates the access support as provided by the - \pkg{accsupp} package. + Activates the access support as provided by the \pkg{accsupp} package. %% \keybool{tooltip}\Default{false} \sinceversion{2.1}Activates tooltip support for \acro\ using the @@ -1175,7 +1166,6 @@ The same for the long forms. %% \keyval{foreign-format}{format}\Default - \sinceversion{1.3}% The format for the \option{foreign} entry when it appears as part of the first appearance of an acronym. %% @@ -1185,14 +1175,13 @@ the formatting according to \option{single-form} is used. %% \keyval{first-long-format}{format}\Default - \sinceversion{1.2}% The format for the long form on first usage (with \cs{ac}, \cs{acf} or \cs{acflike} and their uppercase, plural and indefinite forms). %% \keyval{list-short-format}{format}\Default - \sinceversion{1.1}An extra format for the short entries in the list. If - not used this is the same as \option{short-format}. Please be aware that - a call of \option{short-format} after this one will overwrite it again. + An extra format for the short entries in the list. If not used this is + the same as \option{short-format}. Please be aware that a call of + \option{short-format} after this one will overwrite it again. %% \keyval{list-short-width}{dim}\Default{3em} \sinceversion{2.1}This option controls the width reserved for the short @@ -1211,11 +1200,11 @@ \keyval{extra-format}{format}\Default The same for the extra information. %% - \keychoice{first-style}{default,empty,square,short,long,reversed,footnote,sidenote}% - \Default{default} - \changedversion{1.1}The basic style of the first appearance of an - acronym. The value \code{sidenote} needs the command \cs*{sidenote} to be - defined for example by the \pkg*{sidenotes} package. + \keychoice{first-style}{default,empty,square,short,long,reversed,footnote,sidenote,% + footnote-reversed,sidenote-reversed}\Default{default} + The basic style of the first appearance of an acronym. The value + \code{sidenote} needs the command \cs*{sidenote} to be defined (for + example by the \pkg*{sidenotes} package). %% \keychoice{extra-style}{default,plain,comma,paren,bracket}\Default{default} Defines the way the extra information is printed in the list. @@ -1241,55 +1230,65 @@ \acsetup{first-style=long} long: \acf{ny} \\ \acsetup{first-style=reversed} - reversed: \acf{ny} + reversed: \acf{ny} \\ + \acsetup{ + first-style = footnote-reversed + } + footnote-reversed: \acf{ny} \end{example} \subsection{Options Regarding the List} \begin{options} %% - \keychoice{page-ref}{none,plain,comma,paren}\Default{none} + \keychoice{page-style}{none,plain,comma,paren}\Default{none} If this option is set to a value other than \code{none} the page numbers of the an acronym appeared on are printed in the list. Please note that this is an experimental feature and might fail in quite a number of cases. If you notice anything please send me an email! %% \keychoice{pages}{all,first}\Default{all} - \sinceversion{1.5}If the option \option{page-ref} has any value other than - \code{none} this option determines wether all usages of the acronyms are - listed or only the first time. Implicitly sets \keyis{label}{true}. + If the option \option{page-style} has any value other than \code{none} + this option determines wether all usages of the acronyms are listed or + only the first time. Implicitly sets \keyis{label}{true}. + %% \keyval{page-name}{page name}\Default{p.\cs*{@}\cs*{,}} The ``name'' of the page label. This is automatically translated to the active language. However for the time being there are many translations missing, yet. Please notify me if you find your language missing. %% \keyval{pages-name}{page name plural}\Default{pp.\cs*{@}\cs*{,}} - \sinceversion{1.0}The ``name'' of the page label when there are more than - one page. This is automatically translated to the active language. - However for the time being there are many translations missing, yet. - Please notify me if you find your language missing. + The ``name'' of the page label when there are more than one page. This is + automatically translated to the active language. However for the time + being there are many translations missing, yet. Please notify me if you + find your language missing. %% \keybool{following-page}\Default{false} - \sinceversion{1.3}If set to \code{true} a page range in the list of - acronyms that consists of two pages will be written by the first page and - an appended \code{f}. This depends on the option \option{next-page}. + If set to \code{true} a page range in the list of acronyms that consists + of two pages will be written by the first page and an appended + \code{f}. This depends on the option \option{next-page}. %% \keybool{following-pages}\Default{false} - \sinceversion{1.3}If set to \code{true} a page range in the list of - acronyms that set consists of more than two pages will be written by the - first page and an appended \code{ff}. This depends on the option - \option{next-pages}. + If set to \code{true} a page range in the list of acronyms that set + consists of more than two pages will be written by the first page and an + appended \code{ff}. This depends on the option \option{next-pages}. + %% + \keybool{following-pages*}\Default{false} + \sinceversion{2.5}If set to \code{true} this sets both options + \keyis{following-page}{true} and \keyis{following-pages}{true}. + \code{false} sets \keyis{following-page}{false} and + \keyis{following-pages}{false}. %% \keyval{next-page}{text}\Default{\cs*{,}f.\cs*{@}} - \sinceversion{1.0}Appended to a page number when \option{following-page} - is set to \code{true} and the range is only 2 pages long. This is - automatically translated to the active language. However, for the time - being there are many translations missing, yet. Please notify me if you - find your language missing. + Appended to a page number when \option{following-page} is set to + \code{true} and the range is only 2 pages long. This is automatically + translated to the active language. However, for the time being there are + many translations missing, yet. Please notify me if you find your + language missing. %% \keyval{next-pages}{text}\Default{\cs*{,}ff.\cs*{@}} - \sinceversion{1.0}Appended to a page number when \option{following-pages} - is set to \code{true} and the range is more than 2 pages long. This is - automatically translated to the active language. However, for the time + Appended to a page number when \option{following-pages} is set to + \code{true} and the range is more than 2 pages long. This is + automatically translated to the active language. However, for the time being there are many translations missing, yet. Please notify me if you find your language missing. %% @@ -1304,7 +1303,7 @@ own. \emph{Be aware that per default \emph{all} \code{extra-table} styles only use \code{l} columns. Since acronym descriptions can easily get longer that a line you should probably define your own style if you want - to use them.} See section~\vref{sec:more-list-cust} for details. + to use them.} See section~\vref{sec:lists} for details. %% \keychoice{list-heading}{chapter,chapter*,section,section*,subsection,% subsection*,subsubsection,subsubsection*,addchap,addsec,none}% @@ -1418,7 +1417,7 @@ in the preamble. \section{About Page Ranges} -If you enable the \option{page-ref} option \acro\ adds page numbers to the list +If you enable the \option{page-style} option \acro\ adds page numbers to the list of acronyms. In version~0.\versionstar{} it would add a page reference for an acronym in the list of acronyms that used \cs*{pageref} to refer to the first appearance of an acronym. This is retained using \keyis{pages}{first}. @@ -1427,7 +1426,7 @@ pages are referenced using \cs*{hyperpage}. There are some options that control how this list will be typeset, e.g., -\option{following-page}, \option{next-pages} or the option \option{page-ref} +\option{following-page}, \option{next-pages} or the option \option{page-style} itself. It is important to mention that the page list will always take at least two compilation runs until changes in the options or the actual page numbers affect it. This is due to the fact that the updated sequence is first @@ -1445,21 +1444,26 @@ of the document mark implicit barriers. \end{commands} \begin{options} + \keybool{use-barriers}\Default{false} + \sinceversion{2.5}If you want to use barriers and local lists you have to + activate the feature first. This should be set in the preamble in order + to work reliably. Make sure to watch out for log file messages asking you + to rerun. + \keybool{reset-at-barriers}\Default{false} + If this option is set to \code{true} \cs{acbarrier} implicitly calls + \cs{acresetall}. \keybool{local-to-barriers}\Default{false} - This option can be used as option to the \cs{printacronyms} command to - create a list of only the acronyms of the current \enquote{barrier group}. + This option can \emph{only} be used as option to the \cs{printacronyms} + command. It then prints a list of only the acronyms of the current + \enquote{barrier group}. \end{options} + \begin{example} \acbarrier \printacronyms[local-to-barriers] \ac{ctan} and \ac{lppl} \acbarrier \end{example} -\begin{options} - \keybool{reset-at-barriers}\Default{false} - If this option is set to \code{true} \cs{acbarrier} implicitly calls - \cs{acresetall}. -\end{options} \section{Language Support} \acro\ detects if packages \pkg{babel}~\cite{pkg:babel} or @@ -1496,7 +1500,7 @@ \section{Defining Own Acronym Macros}\label{sec:defining-own-acronym} -The commands\sinceversion{2.0}\sinceversion{2.0}\sinceversion{2.0} explained in +The commands\sinceversion{2.0} explained in section~\vref{sec:using-acronyms-comm} have all been defined with a dedicated command -- there is a family of dedicated commands, actually: \begin{commands} @@ -1619,6 +1623,28 @@ \verbcode+#1+. \command*{acro_barrier:} The code-level version of \cs{acbarrier}. + \command*{acro_switch_off:} + The\sinceversion{2.6} expl3 version of \cs{acswitchoff}. + \command*{acro_switch_on:} + The\sinceversion{2.6} expl3 version of \cs{acswitchon}. + \command*{acro_add_action:n}[ \marg{code}] + Adds\sinceversion{2.7} code to \cs*{acro_get:n}. Inside of \meta{code} + you can refer to the \ac{id} of the acronym with \verbcode+#1+. + \command*{acro_get_property:nn}[\TF\ \marg{id} \marg{property} \marg{true} + \marg{false}] + Fetches\sinceversion{2.7} the property \meta{property} of the acronym + \meta{id} and stores it in a tokenlist variable + \cs*{l__acro_\meta{property}_tl} where all dashes in the property names + are replaced with underscores. \meta{true} is placed in the input stream + if the property had been set, \meta{false} otherwise. + \command*{acro_get_property:nn}[\marg{id} \marg{property}] + Like\sinceversion{2.7} \cs*{acro_get_property:nn}\TF, but without the + \meta{true} and \meta{false} arguments. + \command*{acro_if_property:nn}[\TF\ \marg{id} \marg{property} \marg{true} + \marg{false}] + Checks\sinceversion{2.7} if the property \meta{property} of the acronym + \meta{id} is set and places \meta{true} is in the input stream if yes and + \meta{false} otherwise. \end{commands} \paragraph{Examples} @@ -1747,8 +1773,24 @@ \ProvideAcroEnding {possessive-plural} {s'} {s'} \end{sourcecode} -\section{More on List Customization}\label{sec:more-list-cust} -\subsection{Own List Style} +\section{More on Customization}\label{sec:more-custom} +\subsection{Background Information} +Several of \acro's objects are customized using templates. For each of these +objects it is possible to define own templates\footnote{This requires some +knowledge of \pkg{xtemplate} and expl3. Plans are to provide a documented +interface for users of \acro{} in the future.}. Possibly more interesting: it +is easily possible to define further instances of an object using a certain +template. How this works is explained in the following sections. However, the +basics are always the same. There is a command +\begin{commands} + \command*{DeclareAcro\meta{object + type}Style}[\marg{name}\marg{template}\marg{options}] + which allows to define a new style (\ie, instance) for the object + \meta{object type} using the template \marg{template}. +\end{commands} + +\subsection{Lists}\label{sec:lists} +\subsubsection{Own List Style} The different existing list styles are all built from four different templates, \code{list}, \code{list-of}, \code{table} and \code{extra-table}. @@ -1762,11 +1804,11 @@ Declares a new \acro\ list style \meta{name}. \meta{name} will be the value which can be chosen in the option \option{list-style}. \meta{template} is the name of the template to be used by the style. - Available styles are listed in table~\ref{tab:list-templates}. + Available templates are listed in table~\ref{tab:list-templates}. \meta{options} are the option settings for the corresponding template. \end{commands} -\begin{table} +\begin{table}[hbp] \centering \caption{Available List Templates and Their Options}\label{tab:list-templates} \begin{tabular}{*{4}{>{\ttfamily}l}} @@ -1875,7 +1917,7 @@ \acsetup{list-style=mystyle,hyperref=false} \printacronyms -\subsection{Own List Heading Command} +\subsubsection{Own List Heading Command} With the option \option{list-heading} you can choose which command prints the heading of the list. If you need a different choice than what's already @@ -1891,17 +1933,167 @@ \DeclareAcroListHeading{section}{\section} \end{sourcecode} -\section{Configuration Files} +\subsection{First Styles} +The first styles define how an acronym is typeset when it is used for the +first time. It is set with the option \option{first-style}. Legal values for +this option are defined with the following command: +\begin{commands} + \command{DeclareAcroFirstStyle}[\marg{name}\marg{template}\marg{options}] + Declares a new \acro\ first style \meta{name}. \meta{name} will be the + value which can be chosen in the option \option{first-style}. + \meta{template} is the name of the template to be used by the style. + Available templates are listed in table~\ref{tab:first-templates}. + \meta{options} are the option settings for the corresponding template. +\end{commands} + +Here are two examples of the already available styles and how they are +defined: +\begin{sourcecode} + \DeclareAcroFirstStyle{short}{inline}{ + only-short = true , + brackets = false + } + \DeclareAcroFirstStyle{sidenote-reversed}{note}{ + note-command = \sidenote{#1} , + reversed = true + } +\end{sourcecode} + +\begin{table}[hbp] + \centering + \caption{Available First Style Templates and Their Options}\label{tab:first-templates} + \begin{tabular}{*{4}{>{\ttfamily}l}} + \toprule + \normalfont\bfseries Template & \normalfont\bfseries Option & + \normalfont\bfseries Option Type & \normalfont\bfseries Default \\ + \midrule + inline & brackets & boolean & true \\ + & brackets-type & tokenlist & () \\ + & only-short & boolean & false \\ + & only-long & boolean & false \\ + & reversed & boolean & false \\ + & between & tokenlist \\ + & foreign-sep & tokenlist & ,\textasciitilde \\ + \midrule + note & use-note & boolean & true \\ + & note-command & function & \cs*{footnote}\Marg{\#1} \\ + & reversed & boolean & false \\ + & foreign-sep & tokenlist & ,\textasciitilde \\ + \bottomrule + \end{tabular} +\end{table} + +\subsection{Extra Styles} +The extra styles define how the extra information of an acronym is typeset in +the list. It is set with the option \option{extra-style}. Legal values for +this option are defined with the following command: +\begin{commands} + \command{DeclareAcroExtraStyle}[\marg{name}\marg{template}\marg{options}] + Declares a new \acro\ extra style \meta{name}. \meta{name} will be the + value which can be chosen in the option \option{extra-style}. + \meta{template} is the name of the template to be used by the style. + Available templates are listed in table~\ref{tab:extra-templates}. + \meta{options} are the option settings for the corresponding template. +\end{commands} + +Here are two examples of the already available styles and how they are +defined: +\begin{sourcecode} + \DeclareAcroExtraStyle{default}{inline}{ + brackets = false , + punct = true , + punct-symbol = . + } + \DeclareAcroExtraStyle{paren}{inline}{ + brackets = true , + punct = true , + punct-symbol = + } +\end{sourcecode} + +\begin{table} + \centering + \caption{Available Extra Style Templates and Their Options}\label{tab:extra-templates} + \begin{tabular}{*{4}{>{\ttfamily}l}} + \toprule + \normalfont\bfseries Template & \normalfont\bfseries Option & + \normalfont\bfseries Option Type & \normalfont\bfseries Default \\ + \midrule + inline & punct & boolean & true \\ + & punct-symbol & tokenlist & , \\ + & brackets & boolean & true \\ + & brackets-type & tokenlist & () \\ + \bottomrule + \end{tabular} +\end{table} + +\subsection{Page Number Styles} +The page number styles define how the page numbers where acronyms have been +used are typeset in the list. It is set with the option \option{page-style}. +Legal values for this option are defined with the following command: +\begin{commands} + \command{DeclareAcroPageStyle}[\marg{name}\marg{template}\marg{options}] + Declares a new \acro\ extra style \meta{name}. \meta{name} will be the + value which can be chosen in the option \option{page-style}. + \meta{template} is the name of the template to be used by the style. + Available templates are listed in table~\ref{tab:page-templates}. + \meta{options} are the option settings for the corresponding template. +\end{commands} + +Here are two examples of the already available styles and how they are +defined: +\begin{sourcecode} + \DeclareAcroPageStyle{default}{inline}{ + punct = true , + punct-symbol = . + } + \DeclareAcroPageStyle{paren}{inline}{ + brackets=true , + punct-symbol = ~ + } +\end{sourcecode} + +\begin{table}[hbp] + \centering + \caption{Available Page Number Style Templates and Their + Options}\label{tab:page-templates} + \begin{tabular}{*{3}{>{\ttfamily}l}>{\ttfamily}p{.25\linewidth}} + \toprule + \normalfont\bfseries Template & \normalfont\bfseries Option & + \normalfont\bfseries Option Type & \normalfont\bfseries Default \\ + \midrule + inline & display & boolean & true \\ + & punct & boolean & false \\ + & punct-symbol & tokenlist & , \\ + & brackets & boolean & false \\ + & brackets-type & tokenlist & () \\ + & space & skip & .333333em plus .166666em minus + .111111em \\ + \bottomrule + \end{tabular} +\end{table} + +\subsection{Configuration Files} If\sinceversion{2.2} you repeatedly have the same setup and definitions for -\acro\ in your preamble you might want to place those in a configuration file. -If \acro\ finds a file named \code{acro.cfg} present it inputs it at the end -of the package. The only thing to be aware of is that this file is input like -a package which means that \code{@} is treated as a letter (category code~11). +\acro\ in your preamble\footnote{For example defining new endings, \acro{} + commands, list styles, \ldots} you might want to place those in a +configuration file. If \acro\ finds a file named \code{acro.cfg} present it +inputs it at the end of the package. The only thing to be aware of is that +this file is input like a package which means that \code{@} is treated as a +letter (category code~11). \appendix -\section{All Acronyms Used in this Documentation}\label{sec:documentation_acronyms} -\printacronyms[name=All Acronyms,heading=none] +\acsetup{ + list-style = description , + list-heading = section , + list-name = All Acronyms Used in this Documentation , + page-style = comma , + following-pages* = true , + extra-style = comma +} + +\printacronyms \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acro/example_one.tex new/doc/latex/acro/example_one.tex --- old/doc/latex/acro/example_one.tex 2016-01-09 23:29:28.000000000 +0100 +++ new/doc/latex/acro/example_one.tex 2016-11-25 19:28:01.000000000 +0100 @@ -6,7 +6,7 @@ \usepackage[ngerman]{babel} \usepackage{acro} \acsetup{ - page-ref = paren , % Seitennummer in Klammern + page-style = paren , % Seitennummer in Klammern extra-style = comma , % extra-Informationen mit Komma anhängen only-used = false % für das Beispiel auch die nicht verwendeten in die Liste aufnehmen } @@ -67,7 +67,7 @@ \setlength\LTright{0pt}% \acsetup{ extra-style = plain , - page-ref = plain , + page-style = plain , pages = all }% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acro/example_two.tex new/doc/latex/acro/example_two.tex --- old/doc/latex/acro/example_two.tex 2015-08-26 01:12:09.000000000 +0200 +++ new/doc/latex/acro/example_two.tex 2016-11-25 19:28:01.000000000 +0100 @@ -6,14 +6,15 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage[english]{babel} -\usepackage{fixltx2e} \usepackage[colorlinks]{hyperref} \usepackage{acro} -\DeclareInstance{acro-extra}{paren}{default}{ - punct = true , - punct-symbol = + +\acsetup{ + sort = true , + page-style = comma , + extra-style = paren , + hyperref =true } -\acsetup{sort,page-ref=comma,extra-style=paren,hyperref} \DeclareAcronym{CDMA}{ short = CDMA , diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acro.doc.tlpobj new/tlpkg/tlpobj/acro.doc.tlpobj --- old/tlpkg/tlpobj/acro.doc.tlpobj 2016-05-04 03:14:41.000000000 +0200 +++ new/tlpkg/tlpobj/acro.doc.tlpobj 2017-04-14 17:26:59.000000000 +0200 @@ -1,9 +1,9 @@ name acro.doc category Package -revision 40874 +revision 43186 shortdesc doc files of acro relocated 1 -docfiles size=157 +docfiles size=163 RELOC/doc/latex/acro/README RELOC/doc/latex/acro/acro_en.pdf RELOC/doc/latex/acro/acro_en.tex ++++++ acro.tar.xz ++++++ ++++ 3732 lines of diff (skipped) ++++++ acronym.doc.tar.xz ++++++ ++++++ acronym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acronym.tlpobj new/tlpkg/tlpobj/acronym.tlpobj --- old/tlpkg/tlpobj/acronym.tlpobj 2016-04-14 18:32:51.000000000 +0200 +++ new/tlpkg/tlpobj/acronym.tlpobj 2017-04-14 17:26:59.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/acronym/acronym.sty catalogue-also glossaries catalogue-ctan /macros/latex/contrib/acronym -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics acronym catalogue-version 1.41 ++++++ acroterm.doc.tar.xz ++++++ ++++++ acroterm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acroterm.tlpobj new/tlpkg/tlpobj/acroterm.tlpobj --- old/tlpkg/tlpobj/acroterm.tlpobj 2016-04-14 18:32:51.000000000 +0200 +++ new/tlpkg/tlpobj/acroterm.tlpobj 2017-04-14 17:26:59.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/acroterm/acroterm.sty catalogue-ctan /macros/latex/contrib/acroterm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics acronym glossary catalogue-version 0.1 ++++++ active-conf.doc.tar.xz ++++++ ++++++ active-conf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/active-conf.tlpobj new/tlpkg/tlpobj/active-conf.tlpobj --- old/tlpkg/tlpobj/active-conf.tlpobj 2016-04-14 18:32:51.000000000 +0200 +++ new/tlpkg/tlpobj/active-conf.tlpobj 2017-04-14 17:26:59.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=4 RELOC/tex/latex/active-conf/active-conf.cls catalogue-ctan /macros/latex/contrib/conferences/active-conf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics confproc class catalogue-version 0.3a ++++++ actuarialangle.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/actuarialangle/README new/doc/latex/actuarialangle/README --- old/doc/latex/actuarialangle/README 2012-10-18 00:47:12.000000000 +0200 +++ new/doc/latex/actuarialangle/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -This package defines a single command \actuarialangle to typeset nice -looking "angles" in present value of an annuity symbols common in -actuarial and financial notation. - -LICENCE - -Public Domain - -AUTHOR - -The code in this package was given to me (Vincent Goulet -<vincent.goulet(a)act.ulaval.ca>) by a former colleague who would simply -copy it in the preamble of all his documents needing an "angle" -symbol. The actual author of the code is unknown. - -My sole contribution was to make a package out of the code. - -USAGE - -Copy the package file "where LaTeX can find it", then - - \usepackage{actuarialangle} - -and (in math mode) - - \actuarialangle{n} - -to typeset "angle n". For a complete present value symbol, use -something like - - a_{\actuarialangle{n}} - -SHORTCUTS - -You will most likely want to use the following shortcuts: - -\angl for \actuarialangle -\angln for \angl{n} -\anglr for \angl{r} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/actuarialangle/README.md new/doc/latex/actuarialangle/README.md --- old/doc/latex/actuarialangle/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/actuarialangle/README.md 2017-04-11 23:13:38.000000000 +0200 @@ -0,0 +1,45 @@ +# actuarialangle + +Package `actuarialangle` provides commands to typeset the "angle" +symbol denoting a duration in actuarial notation, such as in symbols +for the present value of certain or life annuities and an overhead +square bracket used to emphasize joint status in symbols of life +contingencies. + +## Licence + +LaTeX Project Public License, version 1.3c or (at your option) any +later version. + +## Version + +2.0 (2017-04-10) + +## Author + +Vincent Goulet <vincent.goulet(a)act.ulaval.ca>, based on code from an +unknown author for `\actuarialangle` and friends. + +## Installation + +The package is part of TeX Live and MiKTeX. If it is not already +installed on your system, run `actuarialangle.dtx` through LaTeX with, +for example, + + pdflatex actuarialangle.dtx + +and copy `actuarialangle.sty` where LaTeX can find it. + +## Documentation + +File `actuarialangle.pdf` contains the complete documentation of the +package. If needed, the documentation can be generated from the +sources using the following commands: + + pdflatex actuarialangle.dtx + makeindex -s gglo.ist -o actuarialangle.gls actuarialangle.glo + pdflatex actuarialangle.dtx + +## Version history + +See the documentation. Binary files old/doc/latex/actuarialangle/actuarialangle.pdf and new/doc/latex/actuarialangle/actuarialangle.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialangle.doc.tlpobj new/tlpkg/tlpobj/actuarialangle.doc.tlpobj --- old/tlpkg/tlpobj/actuarialangle.doc.tlpobj 2016-04-14 18:32:51.000000000 +0200 +++ new/tlpkg/tlpobj/actuarialangle.doc.tlpobj 2017-04-14 17:27:00.000000000 +0200 @@ -1,7 +1,8 @@ name actuarialangle.doc category Package -revision 28004 +revision 43751 shortdesc doc files of actuarialangle relocated 1 -docfiles size=1 - RELOC/doc/latex/actuarialangle/README +docfiles size=27 + RELOC/doc/latex/actuarialangle/README.md + RELOC/doc/latex/actuarialangle/actuarialangle.pdf ++++++ actuarialangle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/actuarialangle/actuarialangle.sty new/tex/latex/actuarialangle/actuarialangle.sty --- old/tex/latex/actuarialangle/actuarialangle.sty 2012-10-18 00:47:12.000000000 +0200 +++ new/tex/latex/actuarialangle/actuarialangle.sty 2017-04-11 23:13:38.000000000 +0200 @@ -1,125 +1,92 @@ %% -%% This file is put in the Public Domain by Vincent Goulet. +%% This is file `actuarialangle.sty', +%% generated with the docstrip utility. %% -%% Original author of the code (and comments past this header) is -%% unknown. +%% The original source files were: %% -%% This package defines a single command \actuarialangle to typeset -%% nice looking "angles" in present value of an annuity symbols common -%% in actuarial and financial notation. -%% -%% USAGE -%% -%% In math mode -%% -%% \actuarialangle{n} -%% -%% to typeset "angle n". For a complete present value symbol, -%% something like -%% -%% a_{\actuarialangle{n}} -%% -%% SHORTCUTS -%% -%% You will most likely want to use the following shortcuts: -%% -%% \angl for \actuarialangle -%% \angln for \angl{n} -%% \anglr for \angl{r} -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{actuarialangle} - -\catcode`\@=11 -\def\actuarialangle{\mathpalette\act@angle} -% -% The operation of \mathpalette causes \actuarialangle{30} to expand -% to a mathchoice. This ensures that proper sizing will be done if -% \angle is ever used outside of a first-level subscript: -% -% \mathchoice{% -% {\act@angle\displaystyle{30}}% -% {\act@angle\textstyle{30}}% -% {\act@angle\scriptstyle{30}}% -% {\act@angle\scriptscriptstyle{30}}% -% } -% -\def\act@angle#1#2{% -\mathord{% -\mkern1mu % Add a bit of preceding space -\vbox{\hrule \hbox{\vbox{% -% This amount of vertical space is the normal space for \overline in a -% subscript: -\kern3\fontdimen8\scriptfont\thr@@ -\hbox{$#1#2\m@th$}}% -% Make the right-hand rule extend down to the depth of a parenthesis -% even if the symbol under the angle does not have a descender: -\setbox\z@\hbox{$#1()$}\vrule depth\dp\z@}}% -\mkern1mu}% Add a bit of following space -}% end \act@angle -% -% \topprecedence puts a precedence number above an item, smashed so -% that the apparent height of the item is its normal height. -% -\def\topprecedence#1#2{\mathpalette{\preced@ t{}{#1}}{#2}} -% -% Put a multiplier in the empty set of braces to increase -% the spacing between the precedence number and the -% symbol to which it applies, e.g. -% -% \def\topprecedence#1#2{\mathpalette{\preced@ t{2.5}{#1}}{#2}} -% -% This also applies for \botprecedence and \vartopprecedence. -% If it is desired that all precedence numbers fall at the -% same height, regardless of whether there is an hrule between -% them and the symbol to which they apply, then make -% \topprecedence the same as \vartopprecedence. -% -\def\botprecedence#1#2{\mathpalette{\preced@ b{}{#1}}{#2}} -% -% \vartopprecedence provides extra space below the top -% symbol, to accommodate an intervening hrule. -% -\def\vartopprecedence#1#2{\mathpalette{\preced@ t3{#1}}{#2}} -% -% In \preced@, #1 is `t' for top or `b' for bottom, #2 is a -% multiplier for the space between the top and bottom symbols (may -% be empty), #3 is the first argument from the user, #4 is -% \displaystyle or \textstyle or \scriptstyle or -% \scriptscriptstyle, from \mathpalette, and #5 is the second -% argument given by the user. This peculiar ordering of the -% arguments is done to work around the restriction of \mathpalette -% that it only reads 2 arguments. -% -\def\preced@#1#2#3#4#5{% -% Measure the arguments: -\setbox\tw@\hbox{$\m@th#4#3$}% -\setbox\z@\hbox{$\m@th#4#5$}\dimen@\wd\z@ -\vbox{% to\ht\z@{% -\baselineskip\z@skip -% \lineskip is set using AMSTeX's \ex@, if available, for a slight -% refinement in the spacing if this macro is used in eightpoint -% text. If \ex@ is not available, \p@ is used. -\lineskip#2\ifx\UNDEFINED\ex@\p@\else\ex@\fi\relax -\lineskiplimit\lineskip -\if b#1\relax\box\z@\else\vss\fi -\hbox to\dimen@{\hss\unhbox\tw@\hss}% -\if t#1\relax\box\z@\else\vss\fi -}% end \vbox -}% end \preced@ -% Restore the category code of the @ character: -\catcode`\@=11 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%To get a little more space after stuff under the angle, define \angl -% in the following way: -% -\def\angl#1{{\actuarialangle{{#1}\mkern2mu}}} -% -% +%% actuarialangle.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2017 Vincent Goulet +%% +%% This file 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. The latest version +%% of this license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2006/05/20 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Vincent Goulet +%% <vincent.goulet(a)act.ulaval.ca>. +%% +%% This work consists of the files actuarialangle.dtx and +%% actuarialangle.ins and the derived files listed in the README.md file. +%% +\NeedsTeXFormat{LaTeX2e}[2009/09/24] +\ProvidesPackage{actuarialangle}[2017/04/10 v2.0 Actuarial angle] +\newif\ifacta@thinspace \acta@thinspacetrue +\newif\ifacta@bracket \acta@brackettrue +\DeclareOption{thinspace}{\acta@thinspacetrue} +\DeclareOption{thickspace}{\acta@thinspacefalse} +\DeclareOption{nobracket}{\acta@bracketfalse} +\ProcessOptions +\DeclareRobustCommand{\actuarialangle}{\mathpalette\acta@angle} +\def\acta@angle#1#2{% + \mathord{% + \mkern1mu + \vbox{\hrule \hbox{% + \vbox{% + \kern3\fontdimen8\scriptfont\thr@@ + \hbox{$#1#2\m@th$}}% + \setbox\z@\hbox{$#1()$}\vrule depth\dp\z@}}% + \mkern1mu}} +\ifacta@thinspace + \def\angl#1{{\actuarialangle{{#1}\mkern1mu}}} +\else + \def\angl#1{{\actuarialangle{{#1}\mkern2mu}}} +\fi \def\angln{{\angl n}} -% \def\anglr{{\angl r}} -% -\def\lift#1#2{{\topprecedence{#1}{#2}}} +\def\anglk{{\angl k}} +\ifacta@bracket + \RequirePackage{pict2e} + \DeclareRobustCommand{\overanglebracket}{% + \mathpalette\acta@anglebracket} + \def\acta@anglebracket#1#2{% + \setbox\z@\hbox{$\m@th#1#2$} + \dimen0\wd\z@ \dimen1\ht\z@ + \setbox\tw@\hbox{% + \setlength{\unitlength}{\dimen1}% + \begin{picture}(0.4,0) + \polyline(0.4001,0)(0.4,0)(0,-0.8) + \end{picture}% + \setlength{\unitlength}{\dimen0}% + \begin{picture}(1,0) + \put(0,0){\line(1,0){1}} + \end{picture}% + \setlength{\unitlength}{\dimen1}% + \begin{picture}(0.4,0) + \polyline(-0.0001,0)(0,0)(0.4,-0.8) + \end{picture}} + \dimen@\wd\tw@ + \vbox to\dimen1{% + \baselineskip\z@ + \lineskip3\fontdimen8\scriptfont\thr@@ + \advance\lineskip by 0.2pt + \lineskiplimit\lineskip + \vss + \box\tw@% + \hbox to\dimen@{\hss\unhbox\z@\hss} + } + } + \let\group\overanglebracket +\fi +\endinput %% %% End of file `actuarialangle.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialangle.tlpobj new/tlpkg/tlpobj/actuarialangle.tlpobj --- old/tlpkg/tlpobj/actuarialangle.tlpobj 2016-04-14 18:32:51.000000000 +0200 +++ new/tlpkg/tlpobj/actuarialangle.tlpobj 2017-04-14 17:27:00.000000000 +0200 @@ -1,14 +1,17 @@ name actuarialangle category Package -revision 28004 -shortdesc Symbol for use in "present value" statements of an annuity +revision 43751 +shortdesc Angle symbol denoting a duration in actuarial and financial notation relocated 1 -longdesc The package defines a single command \actuarialangle to typeset -longdesc "angles" in the 'present value of an annuity' symbols common in -longdesc actuarial and financial notation. +longdesc This package provides commands to typeset the "angle" symbol +longdesc denoting a duration in actuarial notation, such as in symbols +longdesc for the present value of certain or life annuities, and an over +longdesc angle square bracket used to emphasize joint status in symbols +longdesc of life contingencies. runfiles size=1 RELOC/tex/latex/actuarialangle/actuarialangle.sty catalogue-ctan /macros/latex/contrib/actuarialangle -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license pd +catalogue-date 2017-04-12 09:07:39 +0200 +catalogue-license lppl1.3c catalogue-topics graphics-symb +catalogue-version 2.0 ++++++ addlines.doc.tar.xz ++++++ ++++++ addlines.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/addlines.tlpobj new/tlpkg/tlpobj/addlines.tlpobj --- old/tlpkg/tlpobj/addlines.tlpobj 2016-04-14 18:32:52.000000000 +0200 +++ new/tlpkg/tlpobj/addlines.tlpobj 2017-04-14 17:27:00.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/addlines/addlines.sty catalogue-ctan /macros/latex/contrib/addlines -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics geometry catalogue-version 0.2a ++++++ adfathesis.doc.tar.xz ++++++ ++++++ adfathesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adfathesis.tlpobj new/tlpkg/tlpobj/adfathesis.tlpobj --- old/tlpkg/tlpobj/adfathesis.tlpobj 2016-04-14 18:32:52.000000000 +0200 +++ new/tlpkg/tlpobj/adfathesis.tlpobj 2017-04-14 17:27:00.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/bibtex/bst/adfathesis/adfathesis.bst RELOC/tex/latex/adfathesis/adfathesis.cls catalogue-ctan /macros/latex/contrib/adfathesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics dissertation class catalogue-version 2.42 ++++++ adforn.doc.tar.xz ++++++ ++++++ adforn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adforn.tlpobj new/tlpkg/tlpobj/adforn.tlpobj --- old/tlpkg/tlpobj/adforn.tlpobj 2016-04-14 18:32:52.000000000 +0200 +++ new/tlpkg/tlpobj/adforn.tlpobj 2017-04-14 17:27:01.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/adforn/adforn.sty RELOC/tex/latex/adforn/uornementsadf.fd catalogue-ctan /fonts/adforn -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-ornmnt font-type1 catalogue-version 1.001-b-2 ++++++ adfsymbols.doc.tar.xz ++++++ ++++++ adfsymbols.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adfsymbols.tlpobj new/tlpkg/tlpobj/adfsymbols.tlpobj --- old/tlpkg/tlpobj/adfsymbols.tlpobj 2016-04-14 18:32:53.000000000 +0200 +++ new/tlpkg/tlpobj/adfsymbols.tlpobj 2017-04-14 17:27:01.000000000 +0200 @@ -26,7 +26,7 @@ RELOC/tex/latex/adfsymbols/uarrowsadf.fd RELOC/tex/latex/adfsymbols/ubulletsadf.fd catalogue-ctan /fonts/adfsymbols -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-symbol font-type1 catalogue-version 1.001 ++++++ adhocfilelist.doc.tar.xz ++++++ ++++++ adhocfilelist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adhocfilelist.tlpobj new/tlpkg/tlpobj/adhocfilelist.tlpobj --- old/tlpkg/tlpobj/adhocfilelist.tlpobj 2016-04-14 18:32:53.000000000 +0200 +++ new/tlpkg/tlpobj/adhocfilelist.tlpobj 2017-04-14 17:27:01.000000000 +0200 @@ -13,6 +13,6 @@ texmf-dist/scripts/adhocfilelist/herelist.sh texmf-dist/tex/support/adhocfilelist/adhocfilelist.RLS catalogue-ctan /support/adhocfilelist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-debug ++++++ adjmulticol.doc.tar.xz ++++++ ++++++ adjmulticol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adjmulticol.tlpobj new/tlpkg/tlpobj/adjmulticol.tlpobj --- old/tlpkg/tlpobj/adjmulticol.tlpobj 2016-04-14 18:32:53.000000000 +0200 +++ new/tlpkg/tlpobj/adjmulticol.tlpobj 2017-04-14 17:27:01.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/adjmulticol/adjmulticol.sty catalogue-ctan /macros/latex/contrib/adjmulticol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multicol layout catalogue-version 1.1 ++++++ adjustbox.doc.tar.xz ++++++ ++++++ adjustbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adjustbox.tlpobj new/tlpkg/tlpobj/adjustbox.tlpobj --- old/tlpkg/tlpobj/adjustbox.tlpobj 2016-04-14 18:32:54.000000000 +0200 +++ new/tlpkg/tlpobj/adjustbox.tlpobj 2017-04-14 17:27:02.000000000 +0200 @@ -26,7 +26,7 @@ RELOC/tex/latex/adjustbox/trimclip.sty catalogue-also gincltex collectbox realboxes catalogue-ctan /macros/latex/contrib/adjustbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting box-manip catalogue-version 1.0 ++++++ adobemapping.tar.xz ++++++ ++++ 17365 lines of diff (skipped) ++++++ adrconv.doc.tar.xz ++++++ ++++++ adrconv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adrconv.tlpobj new/tlpkg/tlpobj/adrconv.tlpobj --- old/tlpkg/tlpobj/adrconv.tlpobj 2016-04-14 18:33:18.000000000 +0200 +++ new/tlpkg/tlpobj/adrconv.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/adrconv/adrplaner.cfg RELOC/tex/latex/adrconv/adrsmall.cfg catalogue-ctan /macros/latex/contrib/adrconv -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 biblio catalogue-version 1.3 ++++++ adtrees.doc.tar.xz ++++++ ++++++ adtrees.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adtrees.tlpobj new/tlpkg/tlpobj/adtrees.tlpobj --- old/tlpkg/tlpobj/adtrees.tlpobj 2016-04-14 18:33:18.000000000 +0200 +++ new/tlpkg/tlpobj/adtrees.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=7 RELOC/tex/latex/adtrees/adtrees.sty catalogue-ctan /macros/latex/contrib/adtrees -catalogue-date 2016-01-22 05:07:10 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics tree linguistic catalogue-version 1.0 ++++++ advdate.doc.tar.xz ++++++ ++++++ advdate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/advdate.tlpobj new/tlpkg/tlpobj/advdate.tlpobj --- old/tlpkg/tlpobj/advdate.tlpobj 2016-04-14 18:33:18.000000000 +0200 +++ new/tlpkg/tlpobj/advdate.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=2 RELOC/tex/latex/advdate/advdate.sty catalogue-ctan /macros/latex/contrib/advdate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time ++++++ ae.doc.tar.xz ++++++ ++++++ ae.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ae.tlpobj new/tlpkg/tlpobj/ae.tlpobj --- old/tlpkg/tlpobj/ae.tlpobj 2016-04-14 18:33:19.000000000 +0200 +++ new/tlpkg/tlpobj/ae.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -128,7 +128,7 @@ RELOC/tex/latex/ae/t1laett.fd catalogue-also zefonts aeguill catalogue-ctan /fonts/ae -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-virtual font-t1enc catalogue-version 1.4 ++++++ aecc.doc.tar.xz ++++++ ++++++ aecc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aecc.tlpobj new/tlpkg/tlpobj/aecc.tlpobj --- old/tlpkg/tlpobj/aecc.tlpobj 2016-04-14 18:33:19.000000000 +0200 +++ new/tlpkg/tlpobj/aecc.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -33,7 +33,7 @@ RELOC/tex/latex/aecc/aecc.sty RELOC/tex/latex/aecc/t1aeccr.fd catalogue-ctan /fonts/aecc -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-virtual font-t1enc catalogue-version 1.0 ++++++ aeguill.doc.tar.xz ++++++ ++++++ aeguill.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aeguill.tlpobj new/tlpkg/tlpobj/aeguill.tlpobj --- old/tlpkg/tlpobj/aeguill.tlpobj 2016-04-14 18:33:19.000000000 +0200 +++ new/tlpkg/tlpobj/aeguill.tlpobj 2017-04-14 17:27:12.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=2 RELOC/tex/latex/aeguill/aeguill.sty catalogue-ctan /macros/latex/contrib/aeguill -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-virtual font-t1enc ++++++ afm2pl.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/afm2pl.man1.pdf and new/texmf-dist/doc/man/man1/afm2pl.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.doc.tlpobj new/tlpkg/tlpobj/afm2pl.doc.tlpobj --- old/tlpkg/tlpobj/afm2pl.doc.tlpobj 2016-04-27 03:14:31.000000000 +0200 +++ new/tlpkg/tlpobj/afm2pl.doc.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,7 +1,7 @@ name afm2pl.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of afm2pl -docfiles size=15 +docfiles size=9 texmf-dist/doc/man/man1/afm2pl.1 texmf-dist/doc/man/man1/afm2pl.man1.pdf ++++++ afm2pl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.tlpobj new/tlpkg/tlpobj/afm2pl.tlpobj --- old/tlpkg/tlpobj/afm2pl.tlpobj 2016-04-27 03:14:31.000000000 +0200 +++ new/tlpkg/tlpobj/afm2pl.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,6 +1,6 @@ name afm2pl category TLCore -revision 40768 +revision 44166 depend afm2pl.ARCH runfiles size=24 texmf-dist/fonts/enc/dvips/afm2pl/afm2pl-ot1.enc ++++++ afparticle.doc.tar.xz ++++++ ++++++ afparticle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afparticle.tlpobj new/tlpkg/tlpobj/afparticle.tlpobj --- old/tlpkg/tlpobj/afparticle.tlpobj 2016-04-14 18:33:22.000000000 +0200 +++ new/tlpkg/tlpobj/afparticle.tlpobj 2017-04-14 17:27:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/afparticle/afparticle.cls catalogue-ctan /macros/latex/contrib/afparticle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics journalpub class article-like catalogue-version 1.3 ++++++ afthesis.doc.tar.xz ++++++ ++++++ afthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afthesis.tlpobj new/tlpkg/tlpobj/afthesis.tlpobj --- old/tlpkg/tlpobj/afthesis.tlpobj 2016-04-14 18:33:22.000000000 +0200 +++ new/tlpkg/tlpobj/afthesis.tlpobj 2017-04-14 17:27:14.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/afthesis/afthesis.cls RELOC/tex/latex/afthesis/afthesis.sty catalogue-ctan /macros/latex/contrib/afthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics dissertation class catalogue-version 2.7 ++++++ aguplus.doc.tar.xz ++++++ ++++++ aguplus.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aguplus.tlpobj new/tlpkg/tlpobj/aguplus.tlpobj --- old/tlpkg/tlpobj/aguplus.tlpobj 2016-04-14 18:33:23.000000000 +0200 +++ new/tlpkg/tlpobj/aguplus.tlpobj 2017-04-14 17:27:14.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/aguplus/aguplus.sty RELOC/tex/latex/aguplus/agupp.sty catalogue-ctan /macros/latex/contrib/aguplus -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub catalogue-version 1.6b ++++++ aiaa.doc.tar.xz ++++++ ++++++ aiaa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aiaa.tlpobj new/tlpkg/tlpobj/aiaa.tlpobj --- old/tlpkg/tlpobj/aiaa.tlpobj 2016-04-14 18:33:24.000000000 +0200 +++ new/tlpkg/tlpobj/aiaa.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/bibtex/bst/aiaa/aiaa.bst RELOC/tex/latex/aiaa/aiaa-tc.cls catalogue-ctan /macros/latex/contrib/aiaa -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub catalogue-version 3.6 ++++++ aichej.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aichej.tlpobj new/tlpkg/tlpobj/aichej.tlpobj --- old/tlpkg/tlpobj/aichej.tlpobj 2016-04-14 18:33:24.000000000 +0200 +++ new/tlpkg/tlpobj/aichej.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=7 RELOC/bibtex/bst/aichej/aichej.bst catalogue-ctan /biblio/bibtex/contrib/misc/aichej.bst -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 journalpub ++++++ ajl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ajl.tlpobj new/tlpkg/tlpobj/ajl.tlpobj --- old/tlpkg/tlpobj/ajl.tlpobj 2016-04-14 18:33:25.000000000 +0200 +++ new/tlpkg/tlpobj/ajl.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=8 RELOC/bibtex/bst/ajl/ajl.bst catalogue-ctan /biblio/bibtex/contrib/misc/ajl.bst -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 ++++++ akktex.doc.tar.xz ++++++ ++++++ akktex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/akktex.tlpobj new/tlpkg/tlpobj/akktex.tlpobj --- old/tlpkg/tlpobj/akktex.tlpobj 2016-04-14 18:33:25.000000000 +0200 +++ new/tlpkg/tlpobj/akktex.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -38,7 +38,7 @@ RELOC/tex/latex/akktex/akktex.sty RELOC/tex/latex/akktex/akkwidepage.sty catalogue-ctan /macros/latex/contrib/akktex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class maths catalogue-version 0.3.2 ++++++ akletter.doc.tar.xz ++++++ ++++++ akletter.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/akletter.tlpobj new/tlpkg/tlpobj/akletter.tlpobj --- old/tlpkg/tlpobj/akletter.tlpobj 2016-04-14 18:33:25.000000000 +0200 +++ new/tlpkg/tlpobj/akletter.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/akletter/myletter.cls catalogue-also dinbrief envlab formlett catalogue-ctan /macros/latex/contrib/akletter -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter class catalogue-version 1.5i ++++++ alegreya.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/alegreya/README new/doc/fonts/alegreya/README --- old/doc/fonts/alegreya/README 2015-10-22 23:14:22.000000000 +0200 +++ new/doc/fonts/alegreya/README 2016-11-25 19:27:23.000000000 +0100 @@ -1,9 +1,9 @@ -This is the README for the alegreya package, version 2015-10-22. +This is the README for the alegreya package, version 2016-09-15. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Alegreya and Alegreya Sans families of fonts, designed by Juan Pablo del Peral (juan at huertatipografica.com.ar) for Huerta -Tipogr�fica (http://www.huertatipografica.com.ar). +Tipografica (http://www.huertatipografica.com.ar). To install this package on a TDS-compliant TeX system download the file "tex-archive"/install/fonts/alegreya.tds.zip where the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alegreya.doc.tlpobj new/tlpkg/tlpobj/alegreya.doc.tlpobj --- old/tlpkg/tlpobj/alegreya.doc.tlpobj 2016-04-14 18:33:25.000000000 +0200 +++ new/tlpkg/tlpobj/alegreya.doc.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -1,6 +1,6 @@ name alegreya.doc category Package -revision 38689 +revision 42077 shortdesc doc files of alegreya relocated 1 docfiles size=37 ++++++ alegreya.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/alegreya/Alegreya.sty new/tex/latex/alegreya/Alegreya.sty --- old/tex/latex/alegreya/Alegreya.sty 2015-10-05 22:58:13.000000000 +0200 +++ new/tex/latex/alegreya/Alegreya.sty 2016-11-25 19:33:40.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesPackage{Alegreya}[% - 2015/10/04 (Bob Tennent) Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] + 2016/08/19 (Bob Tennent) Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -84,7 +84,7 @@ } \def\bfseries@sf{b}\def\Alegreya@boldstyle{Bold} -\DeclareOptionX{black}{\edef\bfseries@sf{k}\edef\Alegreya@boldstyle{Black}} +\DeclareOptionX{black}{\edef\bfseries@rm{k}\edef\Alegreya@boldstyle{Black}} \ProcessOptionsX\relax @@ -162,7 +162,6 @@ ] {Alegreya} \def\rmfamily{\Alegreya@OsF} - \rmfamily \defaultfontfeatures{} } @@ -253,7 +252,6 @@ {Alegreya} \def\rmfamily{\Alegreya} - \rmfamily \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} \providecommand\infigures{\addfontfeatures{VerticalPosition=ScientificInferior}} @@ -277,7 +275,6 @@ \providecommand\infigures{\@nomath\infigures\fontfigurestyle{inferior}\selectfont} \def\rmdefault{\Alegreyafamily} - \rmfamily \def\useosf{\edef\Alegreya@figurestyle{OsF}\renewcommand*{\rmdefault}{Alegreya-\Alegreya@figurealign OsF}} \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/alegreya/AlegreyaSans.sty new/tex/latex/alegreya/AlegreyaSans.sty --- old/tex/latex/alegreya/AlegreyaSans.sty 2015-10-22 23:14:22.000000000 +0200 +++ new/tex/latex/alegreya/AlegreyaSans.sty 2016-11-25 19:33:40.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesPackage{AlegreyaSans}[% - 2015/10/22 (Bob Tennent) Supports AlegreyaSans and AlegreyaSansSC fonts for all LaTeX engines. ] + 2016/09/15 (Bob Tennent) Supports AlegreyaSans and AlegreyaSansSC fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -144,9 +144,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} % grab current family in case of subsequent change: @@ -158,9 +158,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} \newfontfamily\AlegreyaSansOsF @@ -170,9 +170,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} \newfontfamily\AlegreyaSansLF @@ -182,9 +182,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} \newfontfamily\AlegreyaSansTOsF @@ -194,9 +194,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} \newfontfamily\AlegreyaSansTLF @@ -206,9 +206,9 @@ BoldFont = *-\AlegreyaSans@boldstyle , BoldItalicFont = *-\AlegreyaSans@boldstyle Italic , UprightFeatures = { SmallCapsFont = AlegreyaSansSC-\AlegreyaSans@regularstyle }, - BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle }, + BoldFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle }, ItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@regularstyle Italic }, - BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\Alegreya@boldstyle Italic }, + BoldItalicFeatures = { SmallCapsFont= AlegreyaSansSC-\AlegreyaSans@boldstyle Italic }, ] {AlegreyaSans} \newfontfamily\AlegreyaSansBlack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alegreya.tlpobj new/tlpkg/tlpobj/alegreya.tlpobj --- old/tlpkg/tlpobj/alegreya.tlpobj 2016-04-14 18:33:25.000000000 +0200 +++ new/tlpkg/tlpobj/alegreya.tlpobj 2017-04-14 17:27:15.000000000 +0200 @@ -1,6 +1,6 @@ name alegreya category Package -revision 38689 +revision 42077 shortdesc Alegreya fonts with LaTeX support relocated 1 longdesc The Alegreya fonts are designed by Juan Pablo del Peral for @@ -2312,6 +2312,6 @@ RELOC/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd RELOC/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd catalogue-ctan /fonts/alegreya -catalogue-date 2015-10-22 17:11:45 +0200 +catalogue-date 2016-09-15 15:08:22 +0200 catalogue-license ofl catalogue-topics font font-serif font-sans font-type1 font-ttf ++++++ aleph.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/aleph.1 new/texmf-dist/doc/man/man1/aleph.1 --- old/texmf-dist/doc/man/man1/aleph.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/aleph.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH ALEPH 1 "16 June 2015" "Web2C 2016" +.TH ALEPH 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/aleph.man1.pdf and new/texmf-dist/doc/man/man1/aleph.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/lamed.man1.pdf and new/texmf-dist/doc/man/man1/lamed.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aleph.doc.tlpobj new/tlpkg/tlpobj/aleph.doc.tlpobj --- old/tlpkg/tlpobj/aleph.doc.tlpobj 2016-04-27 03:14:31.000000000 +0200 +++ new/tlpkg/tlpobj/aleph.doc.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,8 +1,8 @@ name aleph.doc category Package -revision 40768 +revision 44166 shortdesc doc files of aleph -docfiles size=21 +docfiles size=11 texmf-dist/doc/aleph/base/News texmf-dist/doc/aleph/base/readme.txt texmf-dist/doc/man/man1/aleph.1 ++++++ alertmessage.doc.tar.xz ++++++ ++++++ alertmessage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alertmessage.tlpobj new/tlpkg/tlpobj/alertmessage.tlpobj --- old/tlpkg/tlpobj/alertmessage.tlpobj 2016-04-14 18:33:51.000000000 +0200 +++ new/tlpkg/tlpobj/alertmessage.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/alertmessage/img/alertmessage-success.png RELOC/tex/latex/alertmessage/img/alertmessage-warning.png catalogue-ctan /macros/latex/contrib/alertmessage -catalogue-date 2015-08-05 05:51:16 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics boxing catalogue-version 1.1 ++++++ alg.doc.tar.xz ++++++ ++++++ alg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alg.tlpobj new/tlpkg/tlpobj/alg.tlpobj --- old/tlpkg/tlpobj/alg.tlpobj 2016-04-14 18:33:51.000000000 +0200 +++ new/tlpkg/tlpobj/alg.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/alg/alg.sty catalogue-also algorithms catalogue-ctan /macros/latex/contrib/alg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pseudocode ++++++ algorithm2e.doc.tar.xz ++++++ ++++++ algorithm2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algorithm2e.tlpobj new/tlpkg/tlpobj/algorithm2e.tlpobj --- old/tlpkg/tlpobj/algorithm2e.tlpobj 2016-04-14 18:33:52.000000000 +0200 +++ new/tlpkg/tlpobj/algorithm2e.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=41 RELOC/tex/latex/algorithm2e/algorithm2e.sty catalogue-ctan /macros/latex/contrib/algorithm2e -catalogue-date 2015-11-09 10:41:40 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pseudocode catalogue-version 5.1 ++++++ algorithmicx.doc.tar.xz ++++++ ++++++ algorithmicx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algorithmicx.tlpobj new/tlpkg/tlpobj/algorithmicx.tlpobj --- old/tlpkg/tlpobj/algorithmicx.tlpobj 2016-04-14 18:33:52.000000000 +0200 +++ new/tlpkg/tlpobj/algorithmicx.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/latex/algorithmicx/algpascal.sty RELOC/tex/latex/algorithmicx/algpseudocode.sty catalogue-ctan /macros/latex/contrib/algorithmicx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pseudocode listing ++++++ algorithms.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algorithms.doc.tlpobj new/tlpkg/tlpobj/algorithms.doc.tlpobj --- old/tlpkg/tlpobj/algorithms.doc.tlpobj 2016-04-14 18:33:53.000000000 +0200 +++ new/tlpkg/tlpobj/algorithms.doc.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -1,6 +1,6 @@ name algorithms.doc category Package -revision 38085 +revision 42428 shortdesc doc files of algorithms relocated 1 docfiles size=91 ++++++ algorithms.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algorithms.tlpobj new/tlpkg/tlpobj/algorithms.tlpobj --- old/tlpkg/tlpobj/algorithms.tlpobj 2016-04-14 18:33:53.000000000 +0200 +++ new/tlpkg/tlpobj/algorithms.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -1,6 +1,6 @@ name algorithms category Package -revision 38085 +revision 42428 shortdesc A suite of tools for typesetting algorithms in pseudo-code relocated 1 longdesc Consists of two environments: algorithm and algorithmic. The @@ -13,7 +13,7 @@ RELOC/tex/latex/algorithms/algorithmic.sty catalogue-also alg catalogue-ctan /macros/latex/contrib/algorithms -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics pseudocode catalogue-version 0.1 ++++++ allrunes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/allrunes/README new/doc/fonts/allrunes/README --- old/doc/fonts/allrunes/README 2006-01-09 01:47:01.000000000 +0100 +++ new/doc/fonts/allrunes/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,158 +0,0 @@ -ALLRUNES - The allrunes package is a set of fonts and a LaTeX package - for writing runes of all kinds using LaTeX. - -AUTHOR AND HOMEPAGE - Carl-Gustav Werner is the author of allrunes. - More information can be found at - http://www.maths.lth.se/~carl/allrunes/ - -COPYRIGHT - This program is provided under the terms of the - LaTeX Project Public License distributed from CTAN - archives in the directory macros/latex/base/lppl.txt. - (C) 2001-2004 Carl-Gustav Werner - -VERSION - This README.txt describes the allrunes version 2.1 - -CHANGES - 1.0 First public release. - 1.01 Removed a few remaining 8-bit characters from - frum.mf. They didn't work with the new MiKTeX - package handling system. Also added a lost table, - added an example and corrected a few spelling - mistakes in the documentation. - 2.0 Added type1 versions for the main types of the - allrunes fonts, and support for them in the LaTeX package. - Merged the former Scandinavian-Gothic and the Continental - font families to a Common Germanic font family. Renamed the - commands for flipping and turning runes. Made the commands - for flipping and turning runes work for all six font families. - Inserted kerning information for the Common Germanic and - Anglo-Frisian font families. Complemented the sets of runes - with a few more, especially the Medieval one. Corrected many - spelling mistakes in the documentation. - 2.1 Modified the handling of type1 fontes to take advantage - of the new map-file handling system of MiKTeX- and teTeX- - implementations. Removed a bug that prevented the use of - medieval rune with straight twigs. Minor updates to the - documentation. - -FILES AND DIRECTORIES AT CTAN - README.txt This file. - allrunes.dtx The source for the allrunes Metafont fonts and - LaTeX package. - allrunes.ins Driver file for allrunes.dtx - allrunes.ps PostScript version of the documentation, - using only mf (pk) fonts. - allrunes.pdf Pdf version of the documentation, - using only type1 fonts. - type1 Directory for the type1 fonts, containing: - pfb Directory for the pfb files - allrunes.map Map file for mapping the type1 file names - -REQUIREMENTS - The installation of the allrunes package requires the docstrip - package. Using the allrunes package requires the ifthen package. - Processing the documentation for the allrunes package requires - the fontenc package and the ec fonts. I do not know what version - of LaTeX is required. - -INSTALLATION (OF THE LATEX PACKAGE AND THE METAFONT SOURCE FILES) - The installation procedure is described in the documentation, but - since there is weak catch 22, in that you might need the fonts to - produce the documentation, and you might need the documentation to - install the fonts, it's also described here. The descriptions below - are intended to be correct for MiKTeX version 2.3 and 2.4, and for - teTeX version 2.0. - - 1. Download the files allrunes.ins and allrunes.dtx to a preferably - empty directory. If you intend to keep the documentation, you'd - better create a suitable directory and put the files there right - now; like - <tex doc base>/fonts/allrunes/ - In a typical MiKTeX system it would be - C:\texmf\doc\fonts\allrunes\ - In a teTeX system it might be like - /usr/local/teTeX/share/texmf/doc/fonts/allrunes/ - 2. Start a window where you can enter commands from the keyboard, - i.e. get an DOS prompt on a Windows machine or a xterm-window - on a UNIX/linux machine. - 3. Go to the directory where you did put the files allrunes.dtx - and allrunes.ins - 4. Run the command - latex allrunes.ins - Wait. There are 231 files to be generated. - 5. Move all the 224 *.mf files to a suitable directory, preferably - <font source base>/public/allrunes/ - which in a typical MiKTeX system would be - C:\texmf\fonts\source\public\allrunes\ - In a teTeX system it might be like - /usr/local/teTeX/share/texmf/fonts/source/public/allrunes/ - 6. Move the 6 *.fd files and the file allrunes.sty - to a suitable directory, preferably - <tex base>/tex/latex/allrunes/ - which in a typical MiKTeX system would be - C:\texmf\tex\latex\allrunes\ - In a typical teTeX system it would be like - /usr/local/teTeX/share/texmf/tex/latex/allrunes/ - 7. Refresh the file name database. In MiKTeX you would run - the command - initexmf -u - or find it somewhere in Start|Program|MiKTeX... - In teTeX you would just run - texhash - or use the configuration tool - texconfig - and find some suitable alternative. - 8. Run the command - latex allrunes.dtx - to produce the documentation and test the installation. - Run it one more time to resolve the references, before - you view it. - -INSTALLATION (OF THE TYPE1 FONT FILES) - - Installation of the type1 fonts requires the allrunes package - to be installed according to the above description. Be sure - that both LaTeX and dvips works fine with the Metafont - fonts before you install the type1 fonts. - - 1. Copy all the files (named fru??.pfb) from the type1/pfb - directory to a suitable directory, preferably - <type1 font base>/public/allrunes - which in a typical MiKTeX system would be - C:\texmf\fonts\type1\public\allrunes\ - and in a teTeX system it might be like - /usr/local/teTeX/share/texmf/fonts/type1/public/allrunes/ - 2. Copy the file allrunes.map from the type1 directory - to some suitable directory, like - <dvips base>/allrunes - which in a typical MiKTeX system would be - C:\texmf\dvips\allrunes\ - and in a teTeX system it might be like - /usr/local/teTeX/share/texmf/dvips/allrunes/ - 3. Edit the file - <texmf base>/web2c/updmap.cfg - which in a typical MiKTeX system would be - C:\texmf\web2c\updmap.cfg - and in a teTeX system it might be like - /usr/local/teTeX/share/texmf/web2c/updmap.cfg - search for a line like: - MixedMap allrunes.map - in the file. If the line is not present, then add that line. - 4. Refresh the file name database, see paragraph 7 above. - 5. Update the other .map files. In MiKTeX you run - initexmf -v --mkmap - and in teTeX you run - updmap - 6. Run - latex allrunes.dtx - then try both - dvips -Ppk allrunes - (which will use the bitmapped pk fonts) and - dvips -Poutline allrunes - (which will use the ouline type1 fonts). You might also try - pdflatex allrunes.dtx - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/allrunes/README.txt new/doc/fonts/allrunes/README.txt --- old/doc/fonts/allrunes/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/fonts/allrunes/README.txt 2016-11-25 19:27:23.000000000 +0100 @@ -0,0 +1,161 @@ +ALLRUNES + The allrunes package is a set of fonts and a LaTeX package + for writing runes of all kinds using LaTeX. + +AUTHOR AND HOMEPAGE + Carl-Gustav Werner is the author of allrunes. + More information can be found at + http://www.maths.lth.se/~carl/allrunes/ + +COPYRIGHT + This program is provided under the terms of the + LaTeX Project Public License distributed from CTAN + archives in the directory macros/latex/base/lppl.txt. + (C) 2001-2014 Carl-Gustav Werner + +VERSION + This README.txt describes the allrunes version 2.1 + +CHANGES + 1.0 First public release. + 1.0.1 Removed a few remaining 8-bit characters from + frum.mf. They didn't work with the new MiKTeX + package handling system. Also added a lost table, + added an example and corrected a few spelling + mistakes in the documentation. + 2.0 Added type1 versions for the main types of the + allrunes fonts, and support for them in the LaTeX package. + Merged the former Scandinavian-Gothic and the Continental + font families to a Common Germanic font family. Renamed the + commands for flipping and turning runes. Made the commands + for flipping and turning runes work for all six font families. + Inserted kerning information for the Common Germanic and + Anglo-Frisian font families. Complemented the sets of runes + with a few more, especially the Medieval one. Corrected many + spelling mistakes in the documentation. + 2.1 Modified the handling of type1 fontes to take advantage + of the new map-file handling system of MiKTeX- and teTeX- + implementations. Removed a bug that prevented the use of + medieval rune with straight twigs. Minor updates to the + documentation. + 2.1.1 Bugfix. \S and \P didn't work in ordinary text. + Updated the installation instructions in this file. + + +FILES AND DIRECTORIES AT CTAN + README.txt This file. + allrunes.dtx The source for the allrunes Metafont fonts and + LaTeX package. + allrunes.ins Driver file for allrunes.dtx + allrunes.ps PostScript version of the documentation, + using only mf (pk) fonts. + allrunes.pdf Pdf version of the documentation, + using only type1 fonts. + type1 Directory for the type1 fonts, containing: + pfb Directory for the pfb files + allrunes.map Map file for mapping the type1 file names + +REQUIREMENTS + The installation of the allrunes package requires the docstrip + package. Using the allrunes package requires the ifthen package. + Processing the documentation for the allrunes package requires + the fontenc package and the ec fonts. I do not know what version + of LaTeX is required. + +INSTALLATION (OF THE LATEX PACKAGE AND THE METAFONT SOURCE FILES) + The installation procedure is described in the documentation, but + since there is weak catch 22, in that you might need the fonts to + produce the documentation, and you might need the documentation to + install the fonts, it's also described here. The descriptions below + are intended to be correct for MiKTeX version 2.9, and for + texlive version 2012 in ubuntu. + + 1. Download the files allrunes.ins and allrunes.dtx to a preferably + empty directory. If you intend to keep the documentation, you'd + better create a suitable directory and put the files there right + now; like + <tex doc base>/fonts/allrunes/ + In a typical MiKTeX system it would be + C:\Local TeX Files\doc\fonts\allrunes\ + (See "Integrating Local Additions" in the MiKTeX-documentation.) + In a texlive system it might be like + /usr/local/share/texmf/doc/fonts/allrunes/ + 2. Start a window where you can enter commands from the keyboard, + i.e. get an DOS prompt on a Windows machine or a xterm-window + on a UNIX/linux machine. It might be necessery to run as Administrator + in Windows or as root (or using sudo) in UNIX/linux. Keep this window + open, you will need it throughout the entire installation. + 3. Go to the directory where you did put the files allrunes.dtx + and allrunes.ins + 4. Run the command + latex allrunes.ins + Some 231 files are generated. + 5. Move all the 224 *.mf files to a suitable directory, preferably + <font source base>/public/allrunes/ + which in a typical MiKTeX system would be + C:\Local TeX Files\fonts\source\public\allrunes\ + In a texlive system it might be like + /usr/local/share/texmf/fonts/source/public/allrunes/ + 6. Move the 6 *.fd files and the file allrunes.sty + to a suitable directory, preferably + <tex base>/tex/latex/allrunes/ + which in a typical MiKTeX system would be + C:\Local TeX Files\tex\latex\allrunes\ + In a typical texlive system it would be like + /usr/local/share/texmf/tex/latex/allrunes/ + 7. Refresh the file name database. In MiKTeX 2.9 you just would run + initexmf --admin --update-fndb + or find it somewhere in Start|Program|MiKTeX 2.9|Maintenance(Admin)| + |Settings(Admin)... + In texlive you would just run + texhash + 8. Run the command + latex allrunes.dtx + to produce the documentation and test the installation. + Run it one more time to resolve the references, before + you view it. + +INSTALLATION (OF THE TYPE1 FONT FILES) + + Installation of the type1 fonts requires the allrunes package + to be installed according to the above description. Make sure + that both LaTeX and dvips works fine with the Metafont + fonts before you install the type1 fonts. + + 1. Move all the files (named fru??.pfb) from the type1/pfb + directory to a suitable directory, preferably + <type1 font base>/public/allrunes + which in a typical MiKTeX system would be + C:\Local TeX Files\fonts\type1\public\allrunes\ + and in a texlive system it might be like + /usr/local/share/texmf/fonts/type1/public/allrunes/ + 2. Move the file allrunes.map from the type1 directory + to some suitable directory, like + <dvips base>/allrunes + which in a typical MiKTeX system would be + C:\Local TeX Files\fonts\map\dvips\allrunes\ + and in a texlive system it might be like + /usr/local/share/texmf/fonts/map/dvips/allrunes/ + 3. In a MiKTeX 2.9 system, run + initexmf --admin --edit-config-file=updmap + to edit the updmap.cfg-file; in that file, add the following line: + MixedMap allrunes.map + then Save, and Exit the editor. + Then, in a MiKTeX system, refresh the file name database, see paragraph 7 above. + In a texlive system, first refresh the file name database, see paragraph 7 above, + then run the command: + updmap-sys --enable MixedMap=allrunes.map + 4. Update the other .map files. In MiKTeX 2.9 you run + initexmf --admin --mkmaps -v + and in texlive you run + update-updmap + updmap-sys + 5. Run + latex allrunes.dtx + then try both + dvips -Ppk allrunes + (which will use the bitmapped pk fonts) and + dvips -Poutline allrunes + (which will use the outline type1 fonts). You might also try + pdflatex allrunes.dtx + Binary files old/doc/fonts/allrunes/allrunes.pdf and new/doc/fonts/allrunes/allrunes.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/allrunes.doc.tlpobj new/tlpkg/tlpobj/allrunes.doc.tlpobj --- old/tlpkg/tlpobj/allrunes.doc.tlpobj 2016-04-14 18:33:53.000000000 +0200 +++ new/tlpkg/tlpobj/allrunes.doc.tlpobj 2017-04-14 17:27:27.000000000 +0200 @@ -1,8 +1,8 @@ name allrunes.doc category Package -revision 21886 +revision 42221 shortdesc doc files of allrunes relocated 1 -docfiles size=159 - RELOC/doc/fonts/allrunes/README +docfiles size=68 + RELOC/doc/fonts/allrunes/README.txt RELOC/doc/fonts/allrunes/allrunes.pdf ++++++ allrunes.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-a/allrunes.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-a.new/allrunes.tar.xz differ: char 27, line 1 ++++++ almfixed.doc.tar.xz ++++++ ++++++ almfixed.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/almfixed.tlpobj new/tlpkg/tlpobj/almfixed.tlpobj --- old/tlpkg/tlpobj/almfixed.tlpobj 2016-04-14 18:34:02.000000000 +0200 +++ new/tlpkg/tlpobj/almfixed.tlpobj 2017-04-14 17:27:31.000000000 +0200 @@ -28,7 +28,7 @@ RELOC/fonts/opentype/public/almfixed/almfixed.otf RELOC/fonts/truetype/public/almfixed/almfixed.ttf catalogue-ctan /fonts/almfixed -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gfl catalogue-topics font font-otf font-ttf catalogue-version 0.92 ++++++ alnumsec.doc.tar.xz ++++++ ++++++ alnumsec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alnumsec.tlpobj new/tlpkg/tlpobj/alnumsec.tlpobj --- old/tlpkg/tlpobj/alnumsec.tlpobj 2016-04-14 18:34:03.000000000 +0200 +++ new/tlpkg/tlpobj/alnumsec.tlpobj 2017-04-14 17:27:31.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/alnumsec/alnumsec.sty catalogue-ctan /macros/latex/contrib/alnumsec -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics headings catalogue-version 0.03 ++++++ alterqcm.doc.tar.xz ++++++ ++++++ alterqcm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alterqcm.tlpobj new/tlpkg/tlpobj/alterqcm.tlpobj --- old/tlpkg/tlpobj/alterqcm.tlpobj 2016-04-14 18:34:04.000000000 +0200 +++ new/tlpkg/tlpobj/alterqcm.tlpobj 2017-04-14 17:27:32.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=6 RELOC/tex/latex/alterqcm/alterqcm.sty catalogue-ctan /macros/latex/contrib/alterqcm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics exam catalogue-version 3.7c ++++++ altfont.doc.tar.xz ++++++ ++++++ altfont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/altfont.tlpobj new/tlpkg/tlpobj/altfont.tlpobj --- old/tlpkg/tlpobj/altfont.tlpobj 2016-04-14 18:34:05.000000000 +0200 +++ new/tlpkg/tlpobj/altfont.tlpobj 2017-04-14 17:27:32.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/altfont/psfont.cfg RELOC/tex/latex/altfont/psfont.sty catalogue-ctan /macros/latex/contrib/altfont -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font-supp catalogue-version 1.1 ++++++ ametsoc.doc.tar.xz ++++++ ++++++ ametsoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ametsoc.tlpobj new/tlpkg/tlpobj/ametsoc.tlpobj --- old/tlpkg/tlpobj/ametsoc.tlpobj 2016-04-14 18:34:05.000000000 +0200 +++ new/tlpkg/tlpobj/ametsoc.tlpobj 2017-04-14 17:27:32.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/bibtex/bst/ametsoc/ametsoc2014.bst RELOC/tex/latex/ametsoc/ametsoc.cls catalogue-ctan /macros/latex/contrib/ametsoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub catalogue-version 4.3.2 ++++++ amiri.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/amiri/NEWS new/doc/fonts/amiri/NEWS --- old/doc/fonts/amiri/NEWS 2015-09-22 00:13:44.000000000 +0200 +++ new/doc/fonts/amiri/NEWS 2017-05-12 23:58:49.000000000 +0200 @@ -1,3 +1,23 @@ +Amiri 0.109 (2016-11-20) +------------------------ +* New glyphs: + - A new stylistic set (`ss06`) to avoid automatically adding ◌ّٰ above لله. + - A localised &. + - U+1EEF0 ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL (𞻰). + - U+1EEF1 ARABIC MATHEMATICAL OPERATOR HAH WITH DAL (𞻱). + - Adding missing forms of U+06C2. + +* Fixes: + - Fix clipping of some vowel marks in Microsoft Office. + - Add descriptive stylistic sets names to the font. + - Many improvements to Amiri Quran Colored, including revamped color + palette by Munzir Taha. + - Improve and redo most of the Arabic math alphanumeric symbols. + - https://github.com/khaledhosny/quran-data/issues/1 + - https://github.com/khaledhosny/quran-data/issues/4 + - https://github.com/khaledhosny/amiri-font/issues/90 + - https://github.com/khaledhosny/amiri-font/issues/106 + Amiri 0.108 (2015-09-21) ------------------------ * New glyphs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/amiri/NEWS-Arabic new/doc/fonts/amiri/NEWS-Arabic --- old/doc/fonts/amiri/NEWS-Arabic 2015-09-22 00:13:44.000000000 +0200 +++ new/doc/fonts/amiri/NEWS-Arabic 2017-05-12 23:58:49.000000000 +0200 @@ -1,3 +1,23 @@ +أميري 0٫109 (2015-09-21) +---------------------- +* المحارف الجديدة: + - دعم لعدم الوضع التلقائي للشدة و الألف الصغيرة (◌ّٰ ) فوق لفظ الجلالة مع + خاصية `ss06` لله. + - نسخة عربية من علامة &. + - علامة ”𞻰“ الرياضياتية (U+1EEF0). + - علامة ”𞻱“ الرياضياتية (U+1EEF1). + - إضافة التنويعات الناقصة لعلامة U+06C2. + +* تحسينات: + - إصلاح اختفاء بعض علامات التشكيل في ميكروسوفت أوفيس. + - وضع أسماء للخصائص الاختيارية في الخط. + - الكثير من التحسينات على خط القرآن الملون، مع ألوان جديدة مساهمة من منذر طه. + - تحسينات و إعادة تصميم للكثير من رموز الرياضيات العربية. + - https://github.com/khaledhosny/quran-data/issues/1 + - https://github.com/khaledhosny/quran-data/issues/4 + - https://github.com/khaledhosny/amiri-font/issues/90 + - https://github.com/khaledhosny/amiri-font/issues/106 + أميري 0٫108 (2015-09-21) ------------------------ * المحارف الجديدة: Binary files old/doc/fonts/amiri/amiri-table.pdf and new/doc/fonts/amiri/amiri-table.pdf differ Binary files old/doc/fonts/amiri/documentation-arabic.pdf and new/doc/fonts/amiri/documentation-arabic.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amiri.doc.tlpobj new/tlpkg/tlpobj/amiri.doc.tlpobj --- old/tlpkg/tlpobj/amiri.doc.tlpobj 2016-04-14 18:34:05.000000000 +0200 +++ new/tlpkg/tlpobj/amiri.doc.tlpobj 2017-05-13 02:06:37.000000000 +0200 @@ -1,9 +1,9 @@ name amiri.doc category Package -revision 38429 +revision 44303 shortdesc doc files of amiri relocated 1 -docfiles size=88 +docfiles size=85 RELOC/doc/fonts/amiri/NEWS RELOC/doc/fonts/amiri/NEWS-Arabic RELOC/doc/fonts/amiri/OFL.txt ++++++ amiri.tar.xz ++++++ Binary files old/fonts/truetype/public/amiri/amiri-bold.ttf and new/fonts/truetype/public/amiri/amiri-bold.ttf differ Binary files old/fonts/truetype/public/amiri/amiri-boldslanted.ttf and new/fonts/truetype/public/amiri/amiri-boldslanted.ttf differ Binary files old/fonts/truetype/public/amiri/amiri-quran-colored.ttf and new/fonts/truetype/public/amiri/amiri-quran-colored.ttf differ Binary files old/fonts/truetype/public/amiri/amiri-quran.ttf and new/fonts/truetype/public/amiri/amiri-quran.ttf differ Binary files old/fonts/truetype/public/amiri/amiri-regular.ttf and new/fonts/truetype/public/amiri/amiri-regular.ttf differ Binary files old/fonts/truetype/public/amiri/amiri-slanted.ttf and new/fonts/truetype/public/amiri/amiri-slanted.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amiri.tlpobj new/tlpkg/tlpobj/amiri.tlpobj --- old/tlpkg/tlpobj/amiri.tlpobj 2016-04-14 18:34:05.000000000 +0200 +++ new/tlpkg/tlpobj/amiri.tlpobj 2017-05-13 02:06:37.000000000 +0200 @@ -1,15 +1,17 @@ name amiri category Package -revision 38429 +revision 44303 shortdesc A classical Arabic typeface, Naskh style relocated 1 -longdesc This is a beta-release of the font, though it is believed to be -longdesc largely usable. (The author retains the right to make -longdesc incompatible changes in the future.) The font covers the Arabic -longdesc and Arabic Supplement blocks of Unicode 6.0, which means it -longdesc essentially covers any language written in Arabic script and -longdesc supported by Unicode. -runfiles size=602 +longdesc Amiri is a classical Arabic typeface in Naskh style for +longdesc typesetting books and other running text. It is a revival of +longdesc the beautiful typeface pioneered in the early 20th century by +longdesc Bulaq Press in Cairo, also known as Amiria Press, after which +longdesc the font is named. The project aims at the revival of the +longdesc aesthetics and traditions of Arabic typesetting, and adapting +longdesc it to the era of digital typesetting, in a publicly available +longdesc form. +runfiles size=707 RELOC/fonts/truetype/public/amiri/amiri-bold.ttf RELOC/fonts/truetype/public/amiri/amiri-boldslanted.ttf RELOC/fonts/truetype/public/amiri/amiri-quran-colored.ttf @@ -17,7 +19,7 @@ RELOC/fonts/truetype/public/amiri/amiri-regular.ttf RELOC/fonts/truetype/public/amiri/amiri-slanted.ttf catalogue-ctan /fonts/amiri -catalogue-date 2015-09-21 10:02:27 +0200 +catalogue-date 2017-05-12 19:56:20 +0200 catalogue-license ofl catalogue-topics font font-ttf arabic -catalogue-version 0.108 +catalogue-version 0.109 ++++++ amsaddr.doc.tar.xz ++++++ ++++++ amsaddr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsaddr.tlpobj new/tlpkg/tlpobj/amsaddr.tlpobj --- old/tlpkg/tlpobj/amsaddr.tlpobj 2016-04-14 18:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/amsaddr.tlpobj 2017-04-14 17:27:33.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/amsaddr/amsaddr.sty catalogue-ctan /macros/latex/contrib/amsaddr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics article-like catalogue-version 1.1 ++++++ amscls.doc.tar.xz ++++++ ++++++ amscls.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amscls.tlpobj new/tlpkg/tlpobj/amscls.tlpobj --- old/tlpkg/tlpobj/amscls.tlpobj 2016-04-14 18:34:09.000000000 +0200 +++ new/tlpkg/tlpobj/amscls.tlpobj 2017-04-14 17:27:34.000000000 +0200 @@ -22,6 +22,6 @@ RELOC/tex/latex/amscls/upref.sty catalogue-also amslatex catalogue-ctan /macros/latex/required/amscls -catalogue-date 2016-03-01 13:36:50 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics class maths ++++++ amsfonts.doc.tar.xz ++++++ ++++++ amsfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsfonts.tlpobj new/tlpkg/tlpobj/amsfonts.tlpobj --- old/tlpkg/tlpobj/amsfonts.tlpobj 2016-04-14 18:34:11.000000000 +0200 +++ new/tlpkg/tlpobj/amsfonts.tlpobj 2017-04-14 17:27:34.000000000 +0200 @@ -12,8 +12,11 @@ longdesc mathematical fonts. All fonts are provided as Adobe Type 1 longdesc files, and all except the Euler fonts are provided as Metafont longdesc source. The distribution also includes the canonical Type 1 -longdesc versions of the Computer Modern family of fonts. Plain TeX and -longdesc LaTeX macros for using the fonts are provided. +longdesc versions of the Computer Modern family of fonts. Basic LaTeX +longdesc support for the symbol fonts is provided by amsfonts.sty, with +longdesc names of individual symbols defined in amssymb.sty. The Euler +longdesc fonts are supported by separate packages; details can be found +longdesc in the documentation. execute addMixedMap cm.map execute addMixedMap cmextra.map execute addMixedMap cyrillic.map @@ -630,7 +633,7 @@ RELOC/tex/plain/amsfonts/amssym.tex RELOC/tex/plain/amsfonts/cyracc.def catalogue-ctan /fonts/amsfonts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-03 20:23:02 +0100 catalogue-license ofl catalogue-topics font font-maths font-symbol-maths font-bbd font-type1 font-mf catalogue-version 3.04 ++++++ amslatex-primer.doc.tar.xz ++++++ ++++++ amsldoc-it.doc.tar.xz ++++++ ++++++ amsldoc-vn.doc.tar.xz ++++++ ++++++ amsmath-it.doc.tar.xz ++++++ ++++++ amsmath.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/README.txt new/doc/latex/amsmath/README.txt --- old/doc/latex/amsmath/README.txt 2016-04-03 00:19:48.000000000 +0200 +++ new/doc/latex/amsmath/README.txt 2017-04-16 00:59:15.000000000 +0200 @@ -1,4 +1,4 @@ -README for amsmath 2.15b [2016/03/10] +README for latex-amsmath bundle [2017/04/14] American Mathematical Society, LaTeX3 Project Copyright 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society. @@ -33,17 +33,28 @@ use as a service to the mathematical community. A number of smaller auxiliary packages are also distributed with the amsmath package. +Effective in 2016, maintenance of amsmath was transferred from AMS to +the LaTeX3 Project; as amsmath is considered a "required" package, this +centralizes control over the core LaTeX components. + ======================================================================== II. INSTALLATION AND GETTING STARTED -In order to use amsmath you need to have TeX installed first. TeX is -not an AMS product. For information on getting TeX see one of the -following: +In order to use amsmath you need to have TeX installed first. +For information on getting TeX see one of the following: http://www.tug.org/ http://www.ams.org/tex/tex-resources -If you are installing amsmath manually, see install.txt. +It is recommended to install a comprehensive distribution, such as +TeX Live, MiKTeX for Windows, or MacTeX for Macintosh. +As part of the "required" LaTeX package subset, amsmath +will already be available if one of these distributions is chosen, + +If you are installing amsmath manually, the most recent version +will be available from the CTAN archives +https://www.ctan.org/pkg/amsmath + The primary documentation for amsmath is in @@ -56,29 +67,57 @@ technote.pdf testmath.pdf -which are included in the collection. +which are included in the collection. All of these can be accessed +easily with most distributions by entering "texdoc filename" at the +command line, or via "TeXdoc Online" at http://texdoc.net . ======================================================================== III. SUBMITTING BUG REPORTS -Technical support is available via the addresses listed above. Bug -reports should be submitted using the standard LaTeX bug reporting -system: Execute the command +Bug reports should be submitted using the standard LaTeX bug reporting +system: + +See the form at - latex latexbug.tex +http://www.latex-project.org/bugs/ and follow the resulting instructions. Select "amslatex" when asked for a category. +Questions regarding usage can be posted at http://tex.stackexchange.com . +Check first to see whether your question has already been answered. + ======================================================================== IV. REMARKS ON THIS RELEASE -Version 2.15 adds some compatibility with luatex 0.87 and fixes to -\dots handling. +Version 2.16 adds some control over spacing around aligned/gathered and +adjustments to the generalized fraction code so that it works in xetex. ======================================================================== V. CHANGE LOG (REVERSE CHRONOLOGICAL ORDER) + +2017-04-14 David Carlisle <latex-bugs(a)latex-project.org> + + * amscd.dtx: typo fix in ProvidesPackage line. + +2016-11-05 amsmath.dtx 2.16a + alignedleftspace[yes|no|yesifneg] package options + New genfrac implementation for XeTeX and LuaTeX + Delete obsolete install.txt file. + + +2016-06-28 amsmath.dtx 2.15d + avoid error on \dots \left .... + +2016-05-26 amsmath.dtx 2.15c + ignore spaces at start of \intertext + +2016-03-10 amsmath.dtx 2.15b + Preserve box0 in \resetMathstrut@ + In xetex, and luatex, add version of \newmcodes@ + that works even if - has a \Umathcode definition. + 2016-03-03 amsmath.dtx 2.15a One missing % added to mathstrut handling. @@ -145,3 +184,8 @@ inside indented lists (displaywidth < columnwidth). Changed the multline/fleqn/leqno indent to match mathmargin when possible instead of always just using multlinetaggap. + +The file diffs-m.txt contains information on development and changes +prior to 2000. + +[end] Binary files old/doc/latex/amsmath/amsbsy.pdf and new/doc/latex/amsmath/amsbsy.pdf differ Binary files old/doc/latex/amsmath/amscd.pdf and new/doc/latex/amsmath/amscd.pdf differ Binary files old/doc/latex/amsmath/amsgen.pdf and new/doc/latex/amsmath/amsgen.pdf differ Binary files old/doc/latex/amsmath/amsldoc.pdf and new/doc/latex/amsmath/amsldoc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/amsldoc.tex new/doc/latex/amsmath/amsldoc.tex --- old/doc/latex/amsmath/amsldoc.tex 2016-03-02 00:30:12.000000000 +0100 +++ new/doc/latex/amsmath/amsldoc.tex 2017-01-23 01:01:03.000000000 +0100 @@ -1,42 +1,28 @@ -%%% ==================================================================== -%%% @LaTeX-file{ -%%% filename = "amsldoc.tex", -%%% version = "2.09", -%%% date = "2004/04/06", -%%% time = "15:13:33 EDT", -%%% checksum = "39446 2620 11111 93831", -%%% author = "American Mathematical Society", -%%% address = "American Mathematical Society, -%%% Technical Support, -%%% Electronic Products and Services, -%%% P. O. Box 6248, -%%% Providence, RI 02940, -%%% USA", -%%% telephone = "401-455-4080 or (in the USA and Canada) -%%% 800-321-4AMS (321-4267)", -%%% FAX = "401-331-3842", -%%% email = "tech-support(a)ams.org (Internet)", -%%% copyright = "Copyright 1999 American Mathematical Society, -%%% all rights reserved. Copying of this file is -%%% authorized only if either: -%%% (1) you make absolutely no changes to your copy, -%%% including name; OR -%%% (2) if you do make changes, you first rename it -%%% to some other name.", -%%% supported = "yes", -%%% keywords = "latex, amsmath", -%%% abstract = "This file is the source file for the user's -%%% guide of the \LaTeX{} package amsmath .", -%%% docstring = "The checksum field above contains a CRC-16 -%%% checksum as the first value, followed by the -%%% equivalent of the standard UNIX wc (word -%%% count) utility output of lines, words, and -%%% characters. This is produced by Robert -%%% Solovay's checksum utility.", -%%% } -%%% ==================================================================== +% +% Copyright 1995, 2000, 2013 American Mathematical Society. +% Copyright 2016 LaTeX3 Project and American Mathematical Society. +% +% This work 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. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is the LaTeX3 Project. +% \documentclass[leqno,titlepage,openany]{amsldoc}[1999/12/13] +\def\MaintainedByLaTeXTeam#1{% +\begin{center}% +\fbox{\fbox{\begin{tabular}{@{}l@{}}% +This file is maintained by the \LaTeX{} Project team.\\% +Bug reports can be opened (category \texttt{#1}) at\\% +\url{http://latex-project.org/bugs.html}.\end{tabular}}}\end{center}} + \ifx\UndEfiNed\url \ClassError{amsldoc}{% This version of amsldoc.tex must be processed\MessageBreak @@ -44,8 +30,11 @@ \fi \title{User's Guide for the \pkg{amsmath} Package (Version~2.0)} -\author{American Mathematical Society} -\date{1999-12-13 (revised 2002-02-25)} +\author{American Mathematical Society, \LaTeX3 Project} +\date{1999-12-13 (revised 2002-02-25, 2016-11-14)} +\makeatletter +\def\@thanks{\bigskip\MaintainedByLaTeXTeam{amslatex}} +\makeatother % Use the amsmath package and amscd package in order to print % examples. @@ -184,12 +173,20 @@ \DeclareMathOperator{\End}{End} \DeclareMathOperator{\xxx}{xxx} +\usepackage{hyperref} +\hypersetup{pdfborder=0 0 0} +\makeatletter +\let\oldcs\cs +\def\cs#1{\texorpdfstring{\oldcs{#1}}{\@backslashchar\@backslashchar#1}} +\let\cn\cs +\makeatother \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \frontmatter \maketitle + \pagestyle{headings} \tableofcontents \cleardoublepage % for better page number placement @@ -321,6 +318,12 @@ \end{description} +\begin{description} +\item[\opt{alignedleftspaceyes}] +\item[\opt{alignedleftspaceno}] +\item[\opt{alignedleftspaceyesifneg}] +\end{description} + To use one of these package options, put the option name in the optional argument of the \cn{usepackage} command\mdash e.g., \verb"\usepackage[intlimits]{amsmath}". @@ -342,6 +345,25 @@ \end{description} +Three options have been added to control the space to the left of +\env{aligned} and \env{gathered} environments. Prior to the 2017 release +a thin space was added to the left but not the right of these constructs. +This appears to have been an accidental feature of the implementation and +was typically corrected by prefixing the environments with \cn{\!}. + +The new default behavior is aimed to ensure that the environments do +not have a thin space added in most cases, and that existing documents +using |\!\begin{aligned}| continue to work as before. + +\begin{description} +\item[\opt{alignedleftspaceyes}] Always add \cn{\,} to the left of \env{aligned} and \env{gathered}. +\item[\opt{alignedleftspaceno}] Never add \cn{\,} to the left of \env{aligned} and \env{gathered}. +\item[\opt{alignedleftspaceyesifneg}] Only add \cn{\,} if the environment is prefixed by negative space. (New default behavior.) +\end{description} + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \chapter{Displayed equations} Binary files old/doc/latex/amsmath/amsmath.pdf and new/doc/latex/amsmath/amsmath.pdf differ Binary files old/doc/latex/amsmath/amsopn.pdf and new/doc/latex/amsmath/amsopn.pdf differ Binary files old/doc/latex/amsmath/amstext.pdf and new/doc/latex/amsmath/amstext.pdf differ Binary files old/doc/latex/amsmath/amsxtra.pdf and new/doc/latex/amsmath/amsxtra.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/changes.txt new/doc/latex/amsmath/changes.txt --- old/doc/latex/amsmath/changes.txt 2016-04-03 00:19:48.000000000 +0200 +++ new/doc/latex/amsmath/changes.txt 2017-04-16 00:59:15.000000000 +0200 @@ -1,3 +1,20 @@ +2017-04-14 David Carlisle <latex-bugs(a)latex-project.org> + + * amscd.dtx: typo fix in ProvidesPackage line. + +2016-11-05 David Carlisle <latex-bugs(a)latex-project.org> + * alignedleftspace[yes|no|yesifneg] package options + * New genfrac implementation for XeTeX and LuaTeX + * Delete obsolete install.txt file. + +2016-06-28 David Carlisle <latex-bugs(a)latex-project.org> + + * amsmath.dtx: Add space to prevent runaway argument error with \dots \left... + +2016-05-26 David Carlisle <latex-bugs(a)latex-project.org> + + * amsmath.dtx: ignore spaces at start of \intertext + 2016-03-10 David Carlisle <latex-bugs(a)latex-project.org> * amsmath.dtx: Preserve box0 in \resetMathstrut@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/install.txt new/doc/latex/amsmath/install.txt --- old/doc/latex/amsmath/install.txt 2016-03-02 00:30:12.000000000 +0100 +++ new/doc/latex/amsmath/install.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -install.txt for amsmath 2.15 [2016/02/20] - -Copyright 2004, 2013 American Mathematical Society. -Copyright 2016 LaTeX3 Project and American Mathematical Society. - -This work 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. -The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX -version 2005/12/01 or later. - -This work has the LPPL maintenance status `maintained'. - -The Current Maintainer of this work is the LaTeX3 Project. - - -=========================================================================== - -If you have a relatively up-do-date TeX system that complies with the -TeX Directory Structure (TDS) standard, installing according to the -instructions in section I below is the easiest method. See - - http://www.tug.org/tds/tds.pdf - -for details on the TDS standard. If your TeX system does not comply -with the TDS standard, please contact the manufacturer of your TeX -system for details on how to install third-party TeX packages. - -The first step is to identify the TEXMF folder that contains files used -by LaTeX. To do this, look for the file article.cls. If you find, e.g., - - /usr/local/share/texmf/tex/latex/base/article.cls - -then we will define TEXMF to mean /usr/local/share/texmf (everything -before the tex/latex/base part). On a Windows system the file location -will probably be something like - - c:\sw\texmf\tex\latex\base\article.cls - -Then we define TEXMF to mean c:\sw\texmf. In the following instructions, -wherever you see "TEXMF" substitute the folder name determined in this -way. - -If this terminology does not make sense to you, seek assistance from a -friend or colleague, or from the company that you bought your TeX -system from, or contact us at one of the above addresses. - -======================================================================== -I. Installing the easy way. - -1. Download the following archive file: - - ftp://ftp.ams.org/pub/tex/amsmath.zip - -2. View the following files to assess the effects of the upgrade on -your system: - - README - install.txt (this file) - diffs-m.txt - -3. Backup the old version of AMS-LaTeX, preferably by moving it out of the -TEXMF tree. - -4. Extract files from the .zip archive using your favorite unzip tool, -setting the extraction target directory to the texmf root directory. - -5. To check the end result, you should find that you now have amsmath.sty -in the following location - - TEXMF/tex/latex/amsmath/amsmath.sty - -Some TeX systems also use a database to keep track of TeX input files. -If this database is not updated, your TeX system might not find the -newly installed files. Consult your TeX system's documentation to -determine how to update this database. - -6. Some files will appear in both the source area and another area. -This is because the source form and the in-use form are identical. -As distributed, the files in the source/latex/ams* areas comprise a -complete copy of the distribution from which all the other files can -be regenerated if need be. If you need to conserve disk space, you -could delete the files in the source area, since they are not needed -for normal use. - -======================================================================== -II. Installing the not-so-easy way. - -Download amsmath.zip from http://www.ctan.org - -Make the following directories, if not already present: - - TEXMF/source/latex/amsmath - TEXMF/tex/latex/amsmath - TEXMF/doc/latex/amsmath - -Backup your old AMS-LaTeX files if they are installed, preferably moving them -out of the TEXMF tree. - -******** revise -- pdf file amsldoc will be included in distrib - -Create a temporary directory and generate documentation files (these assume -a UNIX TeX installation): - - - make directory /tmp/amsmath - - unzip -d /tmp/amscls amsmath.zip - - cd /tmp/amsmath - - Run latex on the file ams-m1.ins to produce .cls and .sty files - - Run latex on *.tex - - [optional] Run latex on *.dtx (technical documentation) - - move *.dvi, *.pdf, *.tex to TEXMF/doc/latex/amsmath - - [optional] move *.dtx to TEXMF/doc/latex/amsmath - - [optional] convert .dvi to .ps or .pdf - - move *.sty and *.cls to TEXMF/tex/latex/amsmath - - delete /tmp/amsmath - -Some TeX systems also use a database to keep track of TeX input files. -If this database is not updated, your TeX system might not find the -newly installed files. Consult your system's documentation to determine -how to update this database. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/manifest.txt new/doc/latex/amsmath/manifest.txt --- old/doc/latex/amsmath/manifest.txt 2016-03-03 23:48:55.000000000 +0100 +++ new/doc/latex/amsmath/manifest.txt 2017-01-23 01:01:03.000000000 +0100 @@ -24,7 +24,6 @@ amsxtra.ins amsxtra.pdf diffs-m.txt -install.txt subeqn.pdf subeqn.tex technote.pdf Binary files old/doc/latex/amsmath/subeqn.pdf and new/doc/latex/amsmath/subeqn.pdf differ Binary files old/doc/latex/amsmath/technote.pdf and new/doc/latex/amsmath/technote.pdf differ Binary files old/doc/latex/amsmath/testmath.pdf and new/doc/latex/amsmath/testmath.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsmath.doc.tlpobj new/tlpkg/tlpobj/amsmath.doc.tlpobj --- old/tlpkg/tlpobj/amsmath.doc.tlpobj 2016-04-14 18:34:19.000000000 +0200 +++ new/tlpkg/tlpobj/amsmath.doc.tlpobj 2017-04-17 16:22:28.000000000 +0200 @@ -1,9 +1,9 @@ name amsmath.doc category Package -revision 40218 +revision 43813 shortdesc doc files of amsmath relocated 1 -docfiles size=637 +docfiles size=638 RELOC/doc/latex/amsmath/README.txt RELOC/doc/latex/amsmath/amsbsy.pdf RELOC/doc/latex/amsmath/amscd.pdf @@ -16,7 +16,6 @@ RELOC/doc/latex/amsmath/amsxtra.pdf RELOC/doc/latex/amsmath/changes.txt RELOC/doc/latex/amsmath/diffs-m.txt - RELOC/doc/latex/amsmath/install.txt RELOC/doc/latex/amsmath/manifest.txt RELOC/doc/latex/amsmath/subeqn.pdf RELOC/doc/latex/amsmath/subeqn.tex ++++++ amsmath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/amsmath/amscd.sty new/tex/latex/amsmath/amscd.sty --- old/tex/latex/amsmath/amscd.sty 2016-03-02 00:30:12.000000000 +0100 +++ new/tex/latex/amsmath/amscd.sty 2017-04-16 00:59:15.000000000 +0200 @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later -\ProvidesPackage{amscd}[1999/11/29 v2.0 AMS Commutatitive Diagrams] +\ProvidesPackage{amscd}[2017/04/14 v2.1 AMS Commutative Diagrams] \RequirePackage{amsgen} \@ifundefined{math@cr}{% \def\math@cr{{\ifnum0=`}\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/amsmath/amsmath.sty new/tex/latex/amsmath/amsmath.sty --- old/tex/latex/amsmath/amsmath.sty 2016-04-03 00:19:48.000000000 +0200 +++ new/tex/latex/amsmath/amsmath.sty 2017-01-23 01:01:05.000000000 +0100 @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later -\ProvidesPackage{amsmath}[2016/03/10 v2.15b AMS math features] +\ProvidesPackage{amsmath}[2016/11/05 v2.16a AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -71,8 +71,22 @@ \fi }% } +\DeclareOption{alignedleftspaceyes}{\def\alignedspace@left{\null\,}} +\DeclareOption{alignedleftspaceno}{\def\alignedspace@left{\null}} +\DeclareOption{alignedleftspaceyesifneg}{% +\def\alignedspace@left{% + \edef\@tempa{\expandafter\@car\the\lastskip\@nil}% + \if-\@tempa\null\,% + \else + \edef\@tempa{\expandafter\@car\the\lastkern\@nil}% + \if-\@tempa\null\,% + \else\null + \fi + \fi}% +} \DeclareOption{?}{} -\ExecuteOptions{nointlimits,sumlimits,namelimits,centertags} +\ExecuteOptions{% + nointlimits,sumlimits,namelimits,centertags,alignedleftspaceyesifneg} \ProcessOptions\par \@ifpackagewith{amsmath}{?}{% \typeout{^^J% @@ -202,12 +216,76 @@ \DeclareRobustCommand{\binom}{\genfrac()\z@{}} \newcommand{\dbinom}{\genfrac(){0pt}0} \newcommand{\tbinom}{\genfrac(){0pt}1} +\ifx\directlua\@undefined +\ifx\XeTeXcharclass\@undefined \DeclareRobustCommand{\genfrac}[4]{% \def\@tempa{#1#2}% \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}% \csname @@\ifx @#3@over\else above\fi \ifx\@tempa\@empty \else withdelims\fi\endcsname} \@tempb{#1#2#3}} +\else +\def\genfrac@rule#1#2#3#4{% +\hbox{$\left#1\vcenter{\hrule \@width\z@ + \@height + \ifdim\fontdimen#2#3\tw@=\z@ + #4\fontdimen6#3\tw@ + \else + \fontdimen#2#3\tw@ + \fi + }\right.$}} +\def\genfrac@choice#1#2{% +\ifx @#2@\else +{\delimitershortfall\z@\delimiterfactor\@m + \mathsurround\z@\nulldelimiterspace\z@ +\ifx c#1\kern-\nulldelimiterspace\fi +\mathchoice +{\genfrac(a)rule{#2}{20}\textfont{2.39}}% +{\genfrac@rule{#2}{21}\textfont{1}}% +{\genfrac(a)rule{#2}{21}\scriptfont{1.45}}% +{\genfrac(a)rule{#2}{21}\scriptscriptfont{1.35}}% +}% +\ifx o#1\kern-\nulldelimiterspace\fi +\fi +} +\DeclareRobustCommand{\genfrac}[6]{{% +\@mathstyle{#4}% +\genfrac@choice o{#1}% +{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}% +\genfrac@choice c{#2}% +}} +\fi +\else +\def\genfrac@rule#1#2#3{% +\hbox{$\left#1\vcenter{\hrule \@width\z@ + \@height + \ifdim\Umathfractiondelsize#2=\z@ + #3\fontdimen6#3\tw@ + \else + \Umathfractiondelsize#2% + \fi + }\right.$}} +\def\genfrac@choice#1#2{% +\ifx @#2@\else +{\delimitershortfall\z@\delimiterfactor\@m + \mathsurround\z@\nulldelimiterspace\z@ +\ifx c#1\kern-\nulldelimiterspace\fi +\mathchoice +{\genfrac(a)rule{#2}\displaystyle{2.39}}% +{\genfrac@rule{#2}\textstyle{1}}% +{\genfrac(a)rule{#2}\scriptstyle{1.45}}% +{\genfrac(a)rule{#2}\scriptscriptstyle{1.35}}% +}% +\ifx o#1\kern-\nulldelimiterspace\fi +\fi +} +\DeclareRobustCommand{\genfrac}[6]{{% +\@mathstyle{#4}% +\genfrac@choice o{#1}% +{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}% +\genfrac@choice c{#2}% +}} +\fi \def\@genfrac#1#2#3#4#5{{#1{\begingroup#4\endgroup#2#3\relax#5}}} \def\@mathstyle#1{% \ifx\@empty#1\@empty\relax @@ -418,7 +496,7 @@ \ifgtest@ % if \keybin@ test \gdef\thedots@{\dotsb@}% \else - \xdef\meaning@{\meaning\@let@token..........}% + \xdef\meaning@{\meaning\@let@token. .........}% \xdef\meaning@@{\@xp\striplong@\meaning@\relax\meaning@}% \@xp\math@\meaning@\math@ \ifgtest@ % if \mathxxx test @@ -1021,7 +1099,7 @@ \ifdim\linewidth=\columnwidth \else \parshape\@ne \@totalleftmargin \linewidth \fi - \noindent##1\par}% + \noindent\ignorespaces##1\par}% \penalty\predisplaypenalty\vskip\abovedisplayskip% }% }} @@ -1264,7 +1342,7 @@ \nonmatherr@{\begin{\@currenvir}}% \fi \savecolumn@ % Assumption: called inside a group - \null\,% + \alignedspace@left \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup \maxfields@#2\relax \ifnum\maxfields@>\m@ne @@ -1328,7 +1406,7 @@ \RIfM@\else \nonmatherr@{\begin{gathered}}% \fi - \null\,% + \alignedspace@left \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup \Let@ \chardef\dspbrk@context\@ne \restore@math@cr \spread@equation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsmath.tlpobj new/tlpkg/tlpobj/amsmath.tlpobj --- old/tlpkg/tlpobj/amsmath.tlpobj 2016-04-14 18:34:20.000000000 +0200 +++ new/tlpkg/tlpobj/amsmath.tlpobj 2017-04-17 16:22:29.000000000 +0200 @@ -1,6 +1,6 @@ name amsmath category Package -revision 40218 +revision 43813 catalogue latex-amsmath shortdesc AMS mathematical facilities for LaTeX relocated 1 @@ -27,7 +27,6 @@ RELOC/tex/latex/amsmath/amsxtra.sty catalogue-also nath mathtools catalogue-ctan /macros/latex/required/amsmath -catalogue-date 2016-04-02 16:07:46 +0200 +catalogue-date 2017-04-15 15:34:41 +0200 catalogue-license lppl1.3 catalogue-topics maths -catalogue-version 2.15b ++++++ amsrefs.doc.tar.xz ++++++ ++++++ amsrefs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsrefs.tlpobj new/tlpkg/tlpobj/amsrefs.tlpobj --- old/tlpkg/tlpobj/amsrefs.tlpobj 2016-04-14 18:34:22.000000000 +0200 +++ new/tlpkg/tlpobj/amsrefs.tlpobj 2017-04-14 17:27:39.000000000 +0200 @@ -24,7 +24,7 @@ RELOC/tex/latex/amsrefs/textcmds.sty catalogue-also biblatex catalogue-ctan /macros/latex/contrib/amsrefs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblio catalogue-version 2.14 ++++++ amstex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/amstex.1 new/texmf-dist/doc/man/man1/amstex.1 --- old/texmf-dist/doc/man/man1/amstex.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/amstex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AMSTEX 1 "16 June 2015" "Web2C 2016" +.TH AMSTEX 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Binary files old/texmf-dist/doc/man/man1/amstex.man1.pdf and new/texmf-dist/doc/man/man1/amstex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.doc.tlpobj new/tlpkg/tlpobj/amstex.doc.tlpobj --- old/tlpkg/tlpobj/amstex.doc.tlpobj 2016-04-27 03:14:35.000000000 +0200 +++ new/tlpkg/tlpobj/amstex.doc.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,8 +1,8 @@ name amstex.doc category Package -revision 40768 +revision 44166 shortdesc doc files of amstex -docfiles size=191 +docfiles size=188 texmf-dist/doc/amstex/base/README texmf-dist/doc/amstex/base/amsguide.pdf texmf-dist/doc/amstex/base/amsguide.tex ++++++ amstex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.tlpobj new/tlpkg/tlpobj/amstex.tlpobj --- old/tlpkg/tlpobj/amstex.tlpobj 2016-04-27 03:14:36.000000000 +0200 +++ new/tlpkg/tlpobj/amstex.tlpobj 2017-05-04 02:06:57.000000000 +0200 @@ -1,6 +1,6 @@ name amstex category Package -revision 40768 +revision 44166 shortdesc American Mathematical Society plain TeX macros longdesc AMSTeX is a TeX macro package, originally written by Michael longdesc Spivak for the American Mathematical Society (AMS) during 1983- @@ -10,6 +10,12 @@ longdesc authors. More recently, the focus of attention has switched to longdesc amslatex, but AMSTeX remains as a working system. depend tex +depend amsfonts +depend amstex +depend cm +depend hyphen-base +depend knuth-lib +depend plain depend amstex.ARCH execute AddFormat name=amstex engine=pdftex options="-translate-file=cp227.tcx *amstex.ini" fmttriggers=amsfonts,amstex,cm,hyphen-base,knuth-lib,plain runfiles size=44 @@ -20,7 +26,7 @@ texmf-dist/tex/amstex/base/amstex.tex texmf-dist/tex/amstex/config/amstex.ini catalogue-ctan /macros/amstex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license lppl catalogue-topics maths catalogue-version 2.2 ++++++ amsthdoc-it.doc.tar.xz ++++++ ++++++ animate.doc.tar.xz ++++++ ++++ 36605 lines of diff (skipped) ++++++ animate.tar.xz ++++++ ++++ 2384 lines of diff (skipped) ++++++ anonchap.doc.tar.xz ++++++ ++++++ anonchap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anonchap.tlpobj new/tlpkg/tlpobj/anonchap.tlpobj --- old/tlpkg/tlpobj/anonchap.tlpobj 2016-04-14 18:34:26.000000000 +0200 +++ new/tlpkg/tlpobj/anonchap.tlpobj 2017-04-14 17:27:41.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/anonchap/anonchap.sty catalogue-ctan /macros/latex/contrib/anonchap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics headings catalogue-version 1.1a ++++++ anonymouspro.doc.tar.xz ++++++ ++++++ anonymouspro.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anonymouspro.tlpobj new/tlpkg/tlpobj/anonymouspro.tlpobj --- old/tlpkg/tlpobj/anonymouspro.tlpobj 2016-04-14 18:34:27.000000000 +0200 +++ new/tlpkg/tlpobj/anonymouspro.tlpobj 2017-04-14 17:27:41.000000000 +0200 @@ -82,7 +82,7 @@ RELOC/tex/latex/anonymouspro/ts1anonymouspro.fd RELOC/tex/latex/anonymouspro/uanonymouspro.fd catalogue-ctan /fonts/anonymouspro -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-mono font-ttf font-type1 catalogue-version 2.1 ++++++ answers.doc.tar.xz ++++++ ++++++ answers.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/answers.tlpobj new/tlpkg/tlpobj/answers.tlpobj --- old/tlpkg/tlpobj/answers.tlpobj 2016-04-14 18:34:28.000000000 +0200 +++ new/tlpkg/tlpobj/answers.tlpobj 2017-04-14 17:27:41.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/answers/answers.sty catalogue-also exams catalogue-ctan /macros/latex/contrib/answers -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics exercise catalogue-version 2.16 ++++++ antiqua.doc.tar.xz ++++++ ++++++ antiqua.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/antiqua.tlpobj new/tlpkg/tlpobj/antiqua.tlpobj --- old/tlpkg/tlpobj/antiqua.tlpobj 2016-04-14 18:34:28.000000000 +0200 +++ new/tlpkg/tlpobj/antiqua.tlpobj 2017-04-14 17:27:41.000000000 +0200 @@ -37,7 +37,7 @@ RELOC/tex/latex/antiqua/t1uaq.fd RELOC/tex/latex/antiqua/ts1uaq.fd catalogue-ctan /fonts/urw/antiqua -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-type1 catalogue-version 001.003 ++++++ antomega.doc.tar.xz ++++++ ++++++ antomega.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/antomega.tlpobj new/tlpkg/tlpobj/antomega.tlpobj --- old/tlpkg/tlpobj/antomega.tlpobj 2016-04-14 18:34:28.000000000 +0200 +++ new/tlpkg/tlpobj/antomega.tlpobj 2017-04-14 17:27:42.000000000 +0200 @@ -110,7 +110,7 @@ RELOC/tex/lambda/antomega/uni1f00.def RELOC/tex/lambda/antomega/ut1enc-antomega.def catalogue-ctan /obsolete/systems/omega/contrib/antomega -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics multilingual omega catalogue-version 0.8 ++++++ antt.doc.tar.xz ++++++ ++++++ antt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/antt.tlpobj new/tlpkg/tlpobj/antt.tlpobj --- old/tlpkg/tlpobj/antt.tlpobj 2016-04-14 18:34:31.000000000 +0200 +++ new/tlpkg/tlpobj/antt.tlpobj 2017-04-14 17:27:43.000000000 +0200 @@ -493,7 +493,7 @@ RELOC/tex/plain/antt/antt-math.tex catalogue-also anttvf catalogue-ctan /fonts/antt -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gfsl catalogue-topics font font-type1 font-otf polish catalogue-version 2.08 ++++++ anufinalexam.doc.tar.xz ++++++ ++++++ anyfontsize.doc.tar.xz ++++++ ++++++ anyfontsize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anyfontsize.tlpobj new/tlpkg/tlpobj/anyfontsize.tlpobj --- old/tlpkg/tlpobj/anyfontsize.tlpobj 2016-04-14 18:34:48.000000000 +0200 +++ new/tlpkg/tlpobj/anyfontsize.tlpobj 2017-04-14 17:27:49.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=1 RELOC/tex/latex/anyfontsize/anyfontsize.sty catalogue-ctan /macros/latex/contrib/anyfontsize -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-use ++++++ anysize.doc.tar.xz ++++++ ++++++ anysize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anysize.tlpobj new/tlpkg/tlpobj/anysize.tlpobj --- old/tlpkg/tlpobj/anysize.tlpobj 2016-04-14 18:34:48.000000000 +0200 +++ new/tlpkg/tlpobj/anysize.tlpobj 2017-04-14 17:27:49.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/anysize/anysize.sty catalogue-ctan /macros/latex/contrib/anysize -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics geometry ++++++ aobs-tikz.doc.tar.xz ++++++ ++++++ aobs-tikz.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aobs-tikz.tlpobj new/tlpkg/tlpobj/aobs-tikz.tlpobj --- old/tlpkg/tlpobj/aobs-tikz.tlpobj 2016-04-14 18:34:48.000000000 +0200 +++ new/tlpkg/tlpobj/aobs-tikz.tlpobj 2017-04-14 17:27:50.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/aobs-tikz/tikzlibraryoverlay-beamer-styles.code.tex catalogue-ctan /graphics/pgf/contrib/aobs-tikz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pgf-tikz presentation catalogue-version 1.0 ++++++ aomart.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aomart/Makefile new/doc/latex/aomart/Makefile --- old/doc/latex/aomart/Makefile 2015-02-19 23:15:50.000000000 +0100 +++ new/doc/latex/aomart/Makefile 2016-11-25 19:28:05.000000000 +0100 @@ -3,7 +3,7 @@ # # This file is in public domain # -# $Id: Makefile,v 1.4 2015-02-18 18:01:49 boris Exp $ +# $Id: Makefile,v 1.5 2016/11/18 21:46:03 boris Exp $ # PACKAGE=aomart @@ -59,7 +59,8 @@ # Archive for the distribution. Includes typeset documentation # archive: all clean - tar -C .. -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS $(PACKAGE) + tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS $(PACKAGE) + mv ../$(PACKAGE).tgz . zip: all clean - zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' \ No newline at end of file + zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aomart/README new/doc/latex/aomart/README --- old/doc/latex/aomart/README 2015-02-19 23:15:50.000000000 +0100 +++ new/doc/latex/aomart/README 2017-05-10 23:12:01.000000000 +0200 @@ -1,12 +1,35 @@ LaTeX Class for The Annals of Mathematics Boris Veytsman - Version 1.14a + Version 1.20 This package provides the class for typesetting articles for The Annals of Mathematics, http://annals.princeton.edu/. Changes: + Version 1.20 + Print primary and secondary subjects separately + We no longer print url if doi is present + + Version 1.19 + Bibliography changes + + Version 1.18 + Now we print keywords and AMS subjects + Added orcid + + Version 1.17a + Bug fixed in aomplain.bst + + Version 1.17 + New field totalpages in the bibliography + + Version 1.16 + Metadata handling changes. + + Version 1.15 + New doi formatting + Version 1.14a New url on the masthead Binary files old/doc/latex/aomart/aomart.pdf and new/doc/latex/aomart/aomart.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aomart/aomsample.bib new/doc/latex/aomart/aomsample.bib --- old/doc/latex/aomart/aomsample.bib 2012-08-20 00:18:34.000000000 +0200 +++ new/doc/latex/aomart/aomsample.bib 2017-05-10 23:12:01.000000000 +0200 @@ -194,7 +194,7 @@ author = {A. Minasyan and D. Osin}, title = {Normal Automorphisms of Relatively Hyperbolic Groups}, arxiv = {0809.2408}, - year = 2008 + year = 2008, } @Article{Zarhin92, @@ -205,7 +205,7 @@ year = 1992, volume = 65, number = 3, - pages = {511--527}, + totalpages = {17}, mrnumber= {1154181}, zblnumber = {0774.14039} } Binary files old/doc/latex/aomart/aomsample.pdf and new/doc/latex/aomart/aomsample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aomart/aomsample.tex new/doc/latex/aomart/aomsample.tex --- old/doc/latex/aomart/aomsample.tex 2012-08-20 00:18:34.000000000 +0200 +++ new/doc/latex/aomart/aomsample.tex 2017-05-10 23:12:01.000000000 +0200 @@ -104,7 +104,7 @@ %\setcounter{tocdepth}{5} -\title[Sample Paper]{Sample Paper for the \pkg{aomart} +\title[Sample Paper]{Sample Paper for the \texttt{aomart} Class} \author[AMS]{American Mathematical Society} \address{AMS\\ @@ -120,14 +120,16 @@ \urladdr{http://borisv.lk.net} \givenname{Boris} \surname{Veytsman} -\copyrightyear{2008--2012} +\copyrightyear{2008--2017} \copyrightnote{\textcopyright~2008--2012 Boris Veytsman} \thanks{The class was commissioned by Annals of Mathematics} \keyword{Hamiltonian paths} \keyword{Typesetting} -\subject{primary}{matsc2000}{123456789} +\subject{primary}{matsc2000}{1AB5} +\subject{primary}{matsc2000}{2FD5} \subject{secondary}{matsc2000}{FFFF} +\subject{secondary}{matsc2000}{G25} \received{\formatdate{2004-12-24}} \revised{\formatdate{2006-04-12}} @@ -150,7 +152,7 @@ %\doinumber{10.1215/S0012-7094-92-06520-3} \mrnumber{MR1154181} \zblnumber{0774.14039} - +\arxivnumber{1234.567890} %\oldsubsections @@ -1732,7 +1734,7 @@ \bibliography{aomsample} -\bibliographystyle{aomalpha} +\bibliographystyle{aomplain} \end{document} \endinput Binary files old/doc/latex/aomart/aomsample1.pdf and new/doc/latex/aomart/aomsample1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aomart/aomsample1.tex new/doc/latex/aomart/aomsample1.tex --- old/doc/latex/aomart/aomsample1.tex 2012-08-20 00:18:34.000000000 +0200 +++ new/doc/latex/aomart/aomsample1.tex 2017-05-10 23:12:01.000000000 +0200 @@ -104,7 +104,7 @@ %\setcounter{tocdepth}{5} -\title[Sample Paper]{Sample Paper for the \pkg{aomart} +\title[Sample Paper]{Sample Paper for the \texttt{aomart} Class} \author[AMS]{American Mathematical Society} \address{AMS\\ @@ -120,14 +120,16 @@ \urladdr{http://borisv.lk.net} \givenname{Boris} \surname{Veytsman} -\copyrightyear{2008--2012} +\copyrightyear{2008--2017} \copyrightnote{\textcopyright~2008--2012 Boris Veytsman} \thanks{The class was commissioned by Annals of Mathematics} \keyword{Hamiltonian paths} \keyword{Typesetting} -\subject{primary}{matsc2000}{123456789} +\subject{primary}{matsc2000}{1AB5} +\subject{primary}{matsc2000}{2FD5} \subject{secondary}{matsc2000}{FFFF} +\subject{secondary}{matsc2000}{G25} \received{\formatdate{2004-12-24}} \revised{\formatdate{2006-04-12}} @@ -150,7 +152,7 @@ %\doinumber{10.1215/S0012-7094-92-06520-3} \mrnumber{MR1154181} \zblnumber{0774.14039} - +\arxivnumber{1234.567890} %\oldsubsections @@ -1725,7 +1727,7 @@ \bibliography{aomsample} -\bibliographystyle{aomalpha} +\bibliographystyle{aomplain} \end{document} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aomart.doc.tlpobj new/tlpkg/tlpobj/aomart.doc.tlpobj --- old/tlpkg/tlpobj/aomart.doc.tlpobj 2016-04-14 18:34:48.000000000 +0200 +++ new/tlpkg/tlpobj/aomart.doc.tlpobj 2017-05-11 02:06:49.000000000 +0200 @@ -1,9 +1,9 @@ name aomart.doc category Package -revision 36324 +revision 44282 shortdesc doc files of aomart relocated 1 -docfiles size=370 +docfiles size=369 RELOC/doc/latex/aomart/Makefile RELOC/doc/latex/aomart/README RELOC/doc/latex/aomart/aomart.bib ++++++ aomart.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/aomart/aomalpha.bst new/bibtex/bst/aomart/aomalpha.bst --- old/bibtex/bst/aomart/aomalpha.bst 2012-08-20 00:18:34.000000000 +0200 +++ new/bibtex/bst/aomart/aomalpha.bst 2017-05-10 23:12:01.000000000 +0200 @@ -2,7 +2,7 @@ %%% This is aomplain.bst file, based on amsplain.bst by AMS %%% to support Annals of Mathematics specific fields. %%% -% Copyright 2010, The Annals of Mathematics. +% Copyright 2010--2017, The Annals of Mathematics. % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any @@ -17,10 +17,8 @@ % The Current Maintainer of this work is Boris Veytsman, % <borisv(a)lk.net> % -% This work consists of the file aomart.dtx the -% derived file aomart.cls, and the file aomplain.bst -% -% Version 1.9, 2011/06/13 +% This work consists of the file aomart.dtx, the +% derived file aomart.cls, and the files aomplain.bst and aomalpha.bst % %%% @@ -79,6 +77,7 @@ editor howpublished institution + issue jfmnumber journal key @@ -101,6 +100,8 @@ year zblnumber titlenote + totalpages + pagetotal } {} { label extra.label sort.label bysame } @@ -367,7 +368,13 @@ jfmnumber output.nonempty.jfmnumber arxiv output.nonempty.arxiv doi output.nonempty.doi - url output.nonempty.url + doi empty$ + { url output.nonempty.url } + { doi missing$ + { url output.nonempty.url } + 'skip$ + if$} + if$ newline$ } @@ -473,7 +480,7 @@ } -FUNCTION {format.journal.vol.year} +FUNCTION {format.journal.vol.num.year} { journal empty$ { "journal name" missing.warning ""} { " \emph{" journal * "}" * } @@ -482,6 +489,19 @@ 'skip$ { " \textbf{" * volume * "}" * } if$ + number empty$ + { issue empty$ + 'skip$ + { " no.~" * issue * } + if$ + } + { issue empty$ + 'skip$ + {"both number and issue are present in " cite$ * warning$} + if$ + " no.~" * number * + } + if$ year empty$ { "year" missing.warning } { " (" * year * ")" * } @@ -628,9 +648,20 @@ multiresult } +% pagetotal is a synonym of totalpages: some styles use +% one, and some another + FUNCTION {format.pages} { pages empty$ - { "" } + { totalpages empty$ + { pagetotal empty$ + { "" } + { pagetotal "~pp." *} + if$ + } + { totalpages "~pp." *} + if$ + } { pages n.dashify } if$ } @@ -791,7 +822,7 @@ format.title "title" output.check titlenote output crossref missing$ - { format.journal.vol.year "journal, volume, and year" output.check + { format.journal.vol.num.year "journal, volume, and year" output.check format.pages "pages" output.check } { format.article.crossref output.nonnull @@ -1431,7 +1462,7 @@ write$ newline$ "\providecommand{\arxiv}[1]{\href{http://www.arxiv.org/abs/#1}{arXiv~#1}}" write$ newline$ - "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}" + "\providecommand{\doi}[1]{\url{https://doi.org/#1}}" write$ newline$ "\providecommand{\MR}{\relax\ifhmode\unskip\space\fi MR }" write$ newline$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/aomart/aomplain.bst new/bibtex/bst/aomart/aomplain.bst --- old/bibtex/bst/aomart/aomplain.bst 2012-08-20 00:18:34.000000000 +0200 +++ new/bibtex/bst/aomart/aomplain.bst 2017-05-10 23:12:01.000000000 +0200 @@ -2,7 +2,7 @@ %%% This is aomplain.bst file, based on amsplain.bst by AMS %%% to support Annals of Mathematics specific fields. %%% -% Copyright 2010, The Annals of Mathematics. +% Copyright 2010-2017, The Annals of Mathematics. % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any @@ -17,10 +17,9 @@ % The Current Maintainer of this work is Boris Veytsman, % <borisv(a)lk.net> % -% This work consists of the file aomart.dtx the -% derived file aomart.cls, and the file aomplain.bst +% This work consists of the file aomart.dtx, the +% derived file aomart.cls, and the files aomplain.bst and aomalpha.bst % -% Version 1.9, 2011/06/13 % %%% @@ -76,6 +75,7 @@ editor howpublished institution + issue jfmnumber journal key @@ -98,6 +98,8 @@ year zblnumber titlenote + totalpages + pagetotal } {} { label bysame } @@ -362,7 +364,13 @@ jfmnumber output.nonempty.jfmnumber arxiv output.nonempty.arxiv doi output.nonempty.doi - url output.nonempty.url + doi empty$ + { url output.nonempty.url } + { doi missing$ + { url output.nonempty.url } + 'skip$ + if$} + if$ newline$ } @@ -468,7 +476,7 @@ } -FUNCTION {format.journal.vol.year} +FUNCTION {format.journal.vol.num.year} { journal empty$ { "journal name" missing.warning ""} { " \emph{" journal * "}" * } @@ -477,6 +485,19 @@ 'skip$ { " \textbf{" * volume * "}" * } if$ + number empty$ + { issue empty$ + 'skip$ + { " no.~" * issue * } + if$ + } + { issue empty$ + 'skip$ + {"both number and issue are present in " cite$ * warning$} + if$ + " no.~" * number * + } + if$ year empty$ { "year" missing.warning } { " (" * year * ")" * } @@ -622,9 +643,20 @@ multiresult } +% pagetotal is a synonym of totalpages: some styles use +% one, and some another + FUNCTION {format.pages} { pages empty$ - { "" } + { totalpages empty$ + { pagetotal empty$ + { "" } + { pagetotal "~pp." *} + if$ + } + { totalpages "~pp." *} + if$ + } { pages n.dashify } if$ } @@ -785,7 +817,7 @@ format.title "title" output.check titlenote output crossref missing$ - { format.journal.vol.year output + { format.journal.vol.num.year output format.pages "pages" output.check } { format.article.crossref output.nonnull @@ -1276,7 +1308,7 @@ write$ newline$ "\providecommand{\arxiv}[1]{\href{http://www.arxiv.org/abs/#1}{arXiv~#1}}" write$ newline$ - "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}" + "\providecommand{\doi}[1]{\url{https://doi.org/#1}}" write$ newline$ "\providecommand{\MR}{\relax\ifhmode\unskip\space\fi MR }" write$ newline$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/aomart/aomart.cls new/tex/latex/aomart/aomart.cls --- old/tex/latex/aomart/aomart.cls 2015-02-19 23:15:50.000000000 +0100 +++ new/tex/latex/aomart/aomart.cls 2017-05-10 23:12:01.000000000 +0200 @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{aomart} -[2015/02/18 v1.14a Typesetting articles for the Annals of Mathematics] +[2017/05/09 v1.20 Typesetting articles for the Annals of Mathematics] \long\def\aom@size@warning#1{% \ClassWarning{aomart}{Size-changing option #1 will not be honored}}% @@ -55,6 +55,12 @@ \newif\if@aom@olddoi \@aom@olddoifalse \DeclareOption{olddoi}{\@aom@olddoitrue} +\newif\if@aom@doiMMXVI +\@aom@doiMMXVIfalse +\DeclareOption{doi2016}{\@aom@doiMMXVItrue} +\newif\if@aom@oldkeywords +\@aom@oldkeywordsfalse +\DeclareOption{oldkeywords}{\@aom@oldkeywordstrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{amsart}} \InputIfFileExists{aomart.cfg}{% \ClassInfo{aomart}{% @@ -76,6 +82,7 @@ urlcolor=black}% \fi\fi \urlstyle{rm} +\RequirePackage{environ} \def\@aom@by{By} \def\@aom@and{and} \AtBeginDocument{\@ifpackageloaded{babel}{% @@ -168,6 +175,7 @@ \@onlypreamble{\address} \@onlypreamble{\curraddr} \@onlypreamble{\urladdr} +\@onlypreamble{\orcid} \@onlypreamble{\givenname} \@onlypreamble{\fulladdress} \@onlypreamble{\surname} @@ -195,14 +203,52 @@ \@onlypreamble{\doinumber} \@onlypreamble{\mrnumber} \@onlypreamble{\zblnumber} -\let\givenname=\@gobble -\let\surname=\@gobble -\let\fulladdress=\@gobble +\@onlypreamble{\arxivnumber} +\def\@names{} +\def\givenname#1{\g@addto@macro\@names{givenname=#1;}} +\def\surname#1{\g@addto@macro\@names{surname=#1;}} +\def\fulladdress#1{\g@addto@macro\@names{fulladdress=#1;}} +\renewcommand{\author}[2][]{% + \ifx\@empty\authors + \gdef\authors{#2}% + \g@addto@macro\@names{author=#2;}% + \else + \g@addto@macro\authors{\and#2}% + \g@addto@macro\@names{\and author=#2;}% + \g@addto@macro\addresses{\author{}}% + \fi + \@ifnotempty{#1}{% + \ifx\@empty\shortauthors + \gdef\shortauthors{#1}% + \else + \g@addto@macro\shortauthors{\and#1}% + \fi + }% +} +\edef\author{\@nx\@dblarg + \@xp\@nx\csname\string\author\endcsname} +\renewcommand{\email}[2][]{% + \g@addto@macro\addresses{\email{#1}{#2}}% + \g@addto@macro\@names{email=#2;}% +} +\renewcommand{\urladdr}[2][]{% + \g@addto@macro\addresses{\urladdr{#1}{#2}}% + \g@addto@macro\@names{urladdr=#2;}% +} +\newcommand{\orcid}[2][]{% + \g@addto@macro\addresses{\orcid{#1}{#2}}% + \g@addto@macro\@names{orcid=#2;}% +} \def\keyword#1{\ifx\@keywords\@empty\gdef\@keywords{#1}\else \g@addto@macro\@keywords{, #1}\fi} -\let\@subjects\@empty -\def\subject#1#2#3{\ifx\@subjects\@empty\gdef\@subjects{#1:#2:#3}\else - \g@addto@macro\@subjects{, #1:#2:#3}\fi} +\let\@primarysubjects\@empty +\let\@secondarysubjects\@empty +\def\subject#1#2#3{% + \expandafter\ifx\csname @#1subjects\endcsname\@empty\relax + \expandafter\gdef\csname @#1subjects\endcsname{#3}% + \else + \expandafter\g@addto@macro\csname @#1subjects\endcsname{, #3}% + \fi} \def\formatdate#1{\@formatdate#1\@endformatdate} \def\@formatdate#1-#2-#3\@endformatdate{% \@tempcnta=#3\relax @@ -235,7 +281,9 @@ \else\def\end@page{#1}\fi} \def\pagespan#1#2{\startpage{#1}\endpage{#2}} \pagespan{1}{} -\renewenvironment{abstract}{% +\long\def\@aom@abstract{} +\long\def\@getabstract#1{% + \long\gdef\@aom@abstract{#1}% \ifx\maketitle\relax \ClassWarning{aomart}{Abstract should precede \protect\maketitle\space in AMS derived classes}% @@ -249,12 +297,10 @@ \parsep\z@ \@plus\p@% \let\fullwidthdisplay\relax% }% - \item[]\normalfont\Small% -}{% - \endlist\egroup% - \ifx\@setabstract\relax\@setabstracta\fi% -} - + \item[]\normalfont\Small#1 + \endlist\egroup} +\renewenvironment{abstract}{\Collect@Body\@getabstract}{% + \ifx\@setabstract\relax\@setabstracta\fi} \let\proposed\@gobble \let\seconded\@gobble \let\corresponding\@gobble @@ -265,6 +311,8 @@ \mrnumber{} \def\zblnumber#1{\gdef\@zblnumber{#1}} \zblnumber{} +\def\arxivnumber#1{\gdef\@arxivnumber{#1}} +\arxivnumber{} \def\copyrightyear#1{\def\@copyrightyear{#1}} \copyrightyear{} \def\copyrightnote#1{\def\@copyrightnote{#1}} @@ -277,10 +325,17 @@ \if@filesw \openout\(a)mainrpi\jobname.rpi% \def\and{\string\and\space}% - \def\pkg##1{ ##1 }% + \ifx\r@LastPage\@undefined + \edef\@tempa{\start@page}% + \else + \def\@tempc##1##2##3##4##5{##2}% + \edef\@tempa{\expandafter\@tempc\r@LastPage}% + \fi \protected@write\@mainrpi{}% {\@percentchar authors=\authors}% \protected@write\@mainrpi{}% + {\@percentchar authors.information={\@names}}% + \protected@write\@mainrpi{}% {\@percentchar title=\@title}% \protected@write\@mainrpi{}% {\@percentchar year=\currentyear}% @@ -296,6 +351,25 @@ {\@percentchar endpage=\@tempa}% \protected@write\@mainrpi{}% {\@percentchar doi=\@doinumber}% + \ifx\@zblnumber\@empty\else + \protected@write\@mainrpi{}% + {\@percentchar zbl=\@zblnumber}% + \fi + \ifx\@mrnumber\@empty\else + \protected@write\@mainrpi{}% + {\@percentchar mr=\@mrnumber}% + \fi + \ifx\@arxivnumber\@empty\else + \protected@write\@mainrpi{}% + {\@percentchar arxiv=\@arxivnumber}% + \fi + \protected@write\@mainrpi{}% + {\@percentchar subjects=Primary \@primarysubjects; Secondary: + \@secondarysubjects}% + \protected@write\@mainrpi{}% + {\@percentchar keywords=\@keywords}% + \protected@write\@mainrpi{}% + {\@percentchar abstract=\@aom@abstract}% \closeout\@mainrpi \fi \egroup} @@ -341,7 +415,10 @@ \ifx\@empty\@date\else \@footnotetext{\@setdate}\fi \ifx\@empty\@subjclass\else \@footnotetext{\@setsubjclass}\fi \ifx\@empty\@keywords\else\@setkeywords\fi - \ifx\@empty\@subjects\else\@setsubjects\fi + \ifx\@empty\@primarysubjects + \ifx\@empty\@secondarysubjects + \else\@setsubjects\fi + \else\@setsubjects\fi \ifx\@empty\thankses\else \@footnotetext{% \def\par{\let\par\@par}\@setthanks}% \fi @@ -353,11 +430,28 @@ \ifpdf \hypersetup{pdfkeywords=\@keywords}% \fi + \if@aom@oldkeywords\else + \@footnotetext{Keywords: \@keywords}% + \fi } \def\@setsubjects{% + \let\@subjects\@empty + \ifx\@primarysubjects\@empty\else + \edef\@subjects{Primary: \@primarysubjects}% + \fi + \ifx\@secondarysubjects\@empty\else + \ifx\@primarysubjects\@empty + \edef\@subjects{Secondary: \@secondarysubjects}% + \else + \edef\@subjects{\@subjects; Secondary: \@secondarysubjects}% + \fi + \fi \ifpdf \hypersetup{pdfsubject=\@subjects}% \fi + \if@aom@oldkeywords\else + \@footnotetext{AMS Classification: \(a)subjects.}% + \fi } \def\@@and{\MakeLowercase{\@aom@and}} \def\enddoc@text{% @@ -393,6 +487,10 @@ \@ifnotempty{##2}{\nobreak\indent \@ifnotempty{##1}{, \ignorespaces##1\unskip}% \url{##2}\par}\endgroup}% + \def\orcid##1##2{\begingroup + \@ifnotempty{##2}{\nobreak\indent + \@ifnotempty{##1}{, \ignorespaces##1\unskip}% + ORCID: ##2\par}\endgroup}% \addresses \endgroup } @@ -456,8 +554,16 @@ \let\bysame@@orig=\bysame \def\bysame{\ClassWarning{aomart}{We no longer omit repeated authors}\bysame@@orig} -\def\doi#1{\if@aom@olddoi\href{http://dx.doi.org/#1}{doi: \path{#1}}% -\else\url{http://dx.doi.org/#1}\fi} +\def\doi#1{% + \if@aom@doiMMXVI + \url{http://dx.doi.org/#1}% + \else + \if@aom@olddoi + \href{http://dx.doi.org/#1}{doi: \path{#1}}% + \else + \url{https://doi.org/#1}% + \fi + \fi} \def\mr#1{\href{http://www.ams.org/mathscinet-getitem?mr=#1}{MR~\path{#1}}} \def\zbl#1{\href{http://www.zentralblatt-math.org/zmath/en/search/?q=an:#1}{Zbl~\path{#1}}} \def\arxiv#1{\href{http://www.arxiv.org/abs/#1}{arXiv~\path{#1}}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aomart.tlpobj new/tlpkg/tlpobj/aomart.tlpobj --- old/tlpkg/tlpobj/aomart.tlpobj 2016-04-14 18:34:49.000000000 +0200 +++ new/tlpkg/tlpobj/aomart.tlpobj 2017-05-11 02:06:49.000000000 +0200 @@ -1,6 +1,6 @@ name aomart category Package -revision 36324 +revision 44282 shortdesc Typeset articles for the Annals of Mathematics relocated 1 longdesc The package provides a class for typesetting articles for The @@ -10,7 +10,7 @@ RELOC/bibtex/bst/aomart/aomplain.bst RELOC/tex/latex/aomart/aomart.cls catalogue-ctan /macros/latex/contrib/aomart -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-05-09 22:28:01 +0200 catalogue-license lppl1.3 catalogue-topics journalpub -catalogue-version 1.14a +catalogue-version 1.20 ++++++ apa.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa.doc.tlpobj new/tlpkg/tlpobj/apa.doc.tlpobj --- old/tlpkg/tlpobj/apa.doc.tlpobj 2016-04-14 18:34:49.000000000 +0200 +++ new/tlpkg/tlpobj/apa.doc.tlpobj 2017-04-14 17:27:50.000000000 +0200 @@ -1,6 +1,6 @@ name apa.doc category Package -revision 15878 +revision 42428 shortdesc doc files of apa relocated 1 docfiles size=29 ++++++ apa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa.tlpobj new/tlpkg/tlpobj/apa.tlpobj --- old/tlpkg/tlpobj/apa.tlpobj 2016-04-14 18:34:49.000000000 +0200 +++ new/tlpkg/tlpobj/apa.tlpobj 2017-04-14 17:27:50.000000000 +0200 @@ -1,6 +1,6 @@ name apa category Package -revision 15878 +revision 42428 shortdesc American Psychological Association format relocated 1 longdesc A LaTeX class to format text according to the American @@ -19,7 +19,7 @@ RELOC/tex/latex/apa/greek.apa catalogue-also mslapa catalogue-ctan /macros/latex/contrib/apa -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-07 08:14:53 +0200 catalogue-license lppl catalogue-topics psychology journalpub catalogue-version 1.3.4 ++++++ apa6.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/README new/doc/latex/apa6/README --- old/doc/latex/apa6/README 2013-06-27 00:53:03.000000000 +0200 +++ new/doc/latex/apa6/README 2017-06-06 01:14:07.000000000 +0200 @@ -3,7 +3,7 @@ apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either Binary files old/doc/latex/apa6/apa6.pdf and new/doc/latex/apa6/apa6.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas --- old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2014-11-21 01:47:20.000000000 +0100 +++ new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -360,7 +360,7 @@ End Sub %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -391,6 +391,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/pseudoTeX/apa6.ptex new/doc/latex/apa6/pseudoTeX/apa6.ptex --- old/doc/latex/apa6/pseudoTeX/apa6.ptex 2014-11-21 01:47:20.000000000 +0100 +++ new/doc/latex/apa6/pseudoTeX/apa6.ptex 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -375,7 +375,7 @@ %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -406,6 +406,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/bibliography.bib new/doc/latex/apa6/samples/bibliography.bib --- old/doc/latex/apa6/samples/bibliography.bib 2014-11-21 01:47:20.000000000 +0100 +++ new/doc/latex/apa6/samples/bibliography.bib 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -190,7 +190,7 @@ } %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -221,6 +221,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/longsample.tex new/doc/latex/apa6/samples/longsample.tex --- old/doc/latex/apa6/samples/longsample.tex 2014-11-21 01:47:20.000000000 +0100 +++ new/doc/latex/apa6/samples/longsample.tex 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -185,7 +185,7 @@ \end{document} %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -216,6 +216,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/shortsample.tex new/doc/latex/apa6/samples/shortsample.tex --- old/doc/latex/apa6/samples/shortsample.tex 2014-11-21 01:47:20.000000000 +0100 +++ new/doc/latex/apa6/samples/shortsample.tex 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -132,7 +132,7 @@ \end{document} %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -163,6 +163,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.doc.tlpobj new/tlpkg/tlpobj/apa6.doc.tlpobj --- old/tlpkg/tlpobj/apa6.doc.tlpobj 2016-04-14 18:34:50.000000000 +0200 +++ new/tlpkg/tlpobj/apa6.doc.tlpobj 2017-06-06 02:21:45.000000000 +0200 @@ -1,9 +1,9 @@ name apa6.doc category Package -revision 35631 +revision 44477 shortdesc doc files of apa6 relocated 1 -docfiles size=162 +docfiles size=163 RELOC/doc/latex/apa6/README RELOC/doc/latex/apa6/apa6.pdf RELOC/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas ++++++ apa6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/apa6.cls new/tex/latex/apa6/apa6.cls --- old/tex/latex/apa6/apa6.cls 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/apa6.cls 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2014/11/20 v2.14 APA formatting (6th edition)] +\ProvidesClass{apa6}[2017/05/30 v2.31 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -151,7 +151,7 @@ \@ifundefined{def@doc}{% }{% doc \ifx\apaSix@ptsize\apaSix@noptsize - \LoadClass[11pt,twoside]{article} % default for doc is 11pt + \LoadClass[11pt]{article} % default for doc is 11pt \else \LoadClass[\apaSix@ptsize]{article} \fi @@ -655,24 +655,28 @@ {\b@level@two@skip}{\e@level@two@skip}% {\normalfont\normalsize\bfseries}} +\newcommand*{\typesectitle}[1]{#1\addperi} -\newcommand*{\addperi}[1]{#1.} +\newcommand*{\addperi}{% + \relax\ifhmode% + \ifnum\spacefactor>\@m \else.\fi% + \fi% +} \renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\parindent}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% {-1em}% - {\normalfont\normalsize\bfseries\addperi}} - + {\normalfont\normalsize\bfseries\typesectitle}} \renewcommand{\paragraph}{\@startsection{paragraph}{4}{\parindent}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% {-1em}% - {\normalfont\normalsize\bfseries\itshape\addperi}} + {\normalfont\normalsize\bfseries\itshape\typesectitle}} \renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% {-\z@\relax}% - {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}} + {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{\addperi}}{\relax}} \AtBeginDocument{\def\st@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite \AtBeginDocument{\def\bibsection{\mspart{\refname}}}% BDB -- this is for apacite + natbib @@ -1046,6 +1050,15 @@ \endlinechar`\^^M \catcode`\^^M=12 \ef@xtable% \fi }% + + \RequirePackage{etoolbox} + \AtEndPreamble{% + \@ifpackageloaded{rotating}{% + \DeclareDelayedFloatFlavor{sidewaystable}{table} + \DeclareDelayedFloatFlavor{sidewaysfigure}{figure} + }{}% + }% + }{% \RequirePackage{float} \floatplacement{figure}{htb} @@ -1280,7 +1293,7 @@ \@ifundefined{def@jou}{}{% -\IfFileExists{flushend.sty}{\RequirePackage{flushend}}{} +\IfFileExists{flushend.sty}{\RequirePackage[keeplastbox]{flushend}}{} \IfFileExists{ftnright.sty}{ @@ -1754,7 +1767,7 @@ %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -1785,6 +1798,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAamerican.txt new/tex/latex/apa6/config/APAamerican.txt --- old/tex/latex/apa6/config/APAamerican.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAamerican.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAbritish.txt new/tex/latex/apa6/config/APAbritish.txt --- old/tex/latex/apa6/config/APAbritish.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAbritish.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAczech.txt new/tex/latex/apa6/config/APAczech.txt --- old/tex/latex/apa6/config/APAczech.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAczech.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -27,15 +27,15 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa6 configuration for Czech] +\ProvidesFile{APAczech.txt}[2012/02/23 v1.25 apa6 configuration for Czech] -\renewcommand{\rheadname}{Z�hlav�}% Running head -\renewcommand{\acksname}{Pozn�mka~autora}% Author Note -\renewcommand{\keywordname}{Kl�cov�~1slova}% Keywords -\renewcommand{\notesname}{Pozn�mky}% Footnotes +\renewcommand{\rheadname}{Záhlaví}% Running head +\renewcommand{\acksname}{Poznámka~autora}% Author Note +\renewcommand{\keywordname}{Klícová~1slova}% Keywords +\renewcommand{\notesname}{Poznámky}% Footnotes %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAdutch.txt new/tex/latex/apa6/config/APAdutch.txt --- old/tex/latex/apa6/config/APAdutch.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAdutch.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Voetnoten}% Footnotes %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAendfloat.cfg new/tex/latex/apa6/config/APAendfloat.cfg --- old/tex/latex/apa6/config/APAendfloat.cfg 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAendfloat.cfg 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -99,7 +99,7 @@ \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -130,6 +130,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAenglish.txt new/tex/latex/apa6/config/APAenglish.txt --- old/tex/latex/apa6/config/APAenglish.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAenglish.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAgerman.txt new/tex/latex/apa6/config/APAgerman.txt --- old/tex/latex/apa6/config/APAgerman.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAgerman.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -32,10 +32,10 @@ \renewcommand{\rheadname}{Kolumnentitel}% Running head \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords -\renewcommand{\notesname}{Fu�noten}% Footnotes +\renewcommand{\notesname}{Fußnoten}% Footnotes %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAgreek.txt new/tex/latex/apa6/config/APAgreek.txt --- old/tex/latex/apa6/config/APAgreek.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAgreek.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAngerman.txt new/tex/latex/apa6/config/APAngerman.txt --- old/tex/latex/apa6/config/APAngerman.txt 2014-11-21 01:47:20.000000000 +0100 +++ new/tex/latex/apa6/config/APAngerman.txt 2017-06-06 01:14:07.000000000 +0200 @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -32,10 +32,10 @@ \renewcommand{\rheadname}{Kolumnentitel}% Running head \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords -\renewcommand{\notesname}{Fu�noten}% Footnotes +\renewcommand{\notesname}{Fußnoten}% Footnotes %% -%% Copyright (C) 2011-2014 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -66,6 +66,7 @@ %% APAngerman.txt, %% APAgreek.txt, %% APAczech.txt, +%% APAturkish.txt, %% APAendfloat.cfg, %% apa6.ptex, %% TeX2WordForapa6.bas, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAturkish.txt new/tex/latex/apa6/config/APAturkish.txt --- old/tex/latex/apa6/config/APAturkish.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/apa6/config/APAturkish.txt 2017-06-06 01:14:07.000000000 +0200 @@ -0,0 +1,79 @@ +%% +%% This is file `./config/APAturkish.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% apa6.dtx (with options: `turkish') +%% ---------------------------------------------------------------------- +%% +%% apa6 - A LaTeX class for formatting documents in compliance with the +%% American Psychological Association's Publication Manual, 6th edition +%% +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% ---------------------------------------------------------------------- +%% +\ProvidesFile{APAturkish.txt}[2016/05/26 v2.2 apa6 configuration for Turkish] + +\renewcommand{\rheadname}{Kısa Başlık}% Running head +\renewcommand{\acksname}{Yazar Notu}% Author Note +\renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords +\renewcommand{\notesname}{Dipnotlar}% Footnotes + +%% +%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Brian D. Beitzel. +%% +%% This work consists of the file apa6.dtx +%% and the derived files apa6.ins, +%% apa6.cls, +%% apa6.pdf, +%% README, +%% APAamerican.txt, +%% APAbritish.txt, +%% APAdutch.txt, +%% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, +%% APAgreek.txt, +%% APAczech.txt, +%% APAturkish.txt, +%% APAendfloat.cfg, +%% apa6.ptex, +%% TeX2WordForapa6.bas, +%% Figure1.pdf, +%% shortsample.tex, +%% longsample.tex, and +%% bibliography.bib. +%% +%% +%% End of file `./config/APAturkish.txt'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.tlpobj new/tlpkg/tlpobj/apa6.tlpobj --- old/tlpkg/tlpobj/apa6.tlpobj 2016-04-14 18:34:50.000000000 +0200 +++ new/tlpkg/tlpobj/apa6.tlpobj 2017-06-06 02:21:46.000000000 +0200 @@ -1,19 +1,17 @@ name apa6 category Package -revision 35631 +revision 44477 shortdesc Format documents in APA style (6th edition) relocated 1 longdesc The class formats documents in APA style (6th Edition). It longdesc provides a full set of facilities in three different output -longdesc modes (journal-like appearance, double-spaced manuscript, LaTeX- -longdesc like document), in contrast to the earlier apa6e, which only -longdesc formats double-spaced manuscripts in APA style. The class can -longdesc mask author identity for copies for use in masked peer review. -longdesc Citations are provided using the apacite bundle; the class -longdesc requires that package if citations are to be typeset. The class -longdesc is a development of the apa class (which is no longer -longdesc maintained). -runfiles size=26 +longdesc modes (journal-like appearance, double-spaced manuscript, +longdesc LaTeX-like document), in contrast to the earlier apa6e, which +longdesc only formats double-spaced manuscripts in APA style. The class +longdesc can mask author identity for copies for use in masked peer +longdesc review. The class is a development of the apa class (which is +longdesc no longer maintained). +runfiles size=27 RELOC/tex/latex/apa6/apa6.cls RELOC/tex/latex/apa6/config/APAamerican.txt RELOC/tex/latex/apa6/config/APAbritish.txt @@ -24,8 +22,9 @@ RELOC/tex/latex/apa6/config/APAgerman.txt RELOC/tex/latex/apa6/config/APAgreek.txt RELOC/tex/latex/apa6/config/APAngerman.txt + RELOC/tex/latex/apa6/config/APAturkish.txt catalogue-ctan /macros/latex/contrib/apa6 -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl1.3 +catalogue-date 2017-05-30 22:54:49 +0200 +catalogue-license lppl1.3c catalogue-topics class apa psychology journalpub -catalogue-version 2.14 +catalogue-version 2.31 ++++++ apa6e.doc.tar.xz ++++++ ++++++ apa6e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6e.tlpobj new/tlpkg/tlpobj/apa6e.tlpobj --- old/tlpkg/tlpobj/apa6e.tlpobj 2016-04-14 18:34:50.000000000 +0200 +++ new/tlpkg/tlpobj/apa6e.tlpobj 2017-04-14 17:27:51.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/apa6e/apa6e.cls catalogue-ctan /macros/latex/contrib/apa6e -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics apa psychology class journalpub catalogue-version 0.3 ++++++ apacite.doc.tar.xz ++++++ ++++++ apacite.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apacite.tlpobj new/tlpkg/tlpobj/apacite.tlpobj --- old/tlpkg/tlpobj/apacite.tlpobj 2016-04-14 18:34:52.000000000 +0200 +++ new/tlpkg/tlpobj/apacite.tlpobj 2017-04-14 17:27:51.000000000 +0200 @@ -30,7 +30,7 @@ RELOC/tex/latex/apacite/spanish.apc RELOC/tex/latex/apacite/swedish.apc catalogue-ctan /biblio/bibtex/contrib/apacite -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics psychology journalpub bibtex-sty bibtex-supp catalogue-version 6.03 ++++++ apalike2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apalike2.tlpobj new/tlpkg/tlpobj/apalike2.tlpobj --- old/tlpkg/tlpobj/apalike2.tlpobj 2016-04-14 18:34:52.000000000 +0200 +++ new/tlpkg/tlpobj/apalike2.tlpobj 2017-04-14 17:27:52.000000000 +0200 @@ -4,10 +4,10 @@ shortdesc Bibliography style that approaches APA requirements relocated 1 longdesc Described as a "local adaptation" of apalike (which is part of -longdesc the base bibtex distribution). +longdesc the base BibTeX distribution). runfiles size=7 RELOC/bibtex/bst/apalike2/apalike2.bst catalogue-ctan /biblio/bibtex/contrib/apalike2 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-03 05:37:55 +0100 catalogue-license knuth catalogue-topics psychology journalpub bibtex-sty ++++++ apnum.doc.tar.xz ++++++ ++++++ apnum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apnum.tlpobj new/tlpkg/tlpobj/apnum.tlpobj --- old/tlpkg/tlpobj/apnum.tlpobj 2016-04-14 18:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/apnum.tlpobj 2017-04-14 17:27:52.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=13 RELOC/tex/generic/apnum/apnum.tex catalogue-ctan /macros/generic/apnum -catalogue-date 2016-02-12 21:39:36 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics calculation catalogue-version 1.6 ++++++ appendix.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/appendix.doc.tlpobj new/tlpkg/tlpobj/appendix.doc.tlpobj --- old/tlpkg/tlpobj/appendix.doc.tlpobj 2016-04-14 18:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/appendix.doc.tlpobj 2017-04-14 17:27:52.000000000 +0200 @@ -1,6 +1,6 @@ name appendix.doc category Package -revision 39039 +revision 42428 shortdesc doc files of appendix relocated 1 docfiles size=46 ++++++ appendix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/appendix.tlpobj new/tlpkg/tlpobj/appendix.tlpobj --- old/tlpkg/tlpobj/appendix.tlpobj 2016-04-14 18:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/appendix.tlpobj 2017-04-14 17:27:52.000000000 +0200 @@ -1,6 +1,6 @@ name appendix category Package -revision 39039 +revision 42428 shortdesc Extra control of appendices relocated 1 longdesc The appendix package provides various ways of formatting the @@ -16,7 +16,7 @@ runfiles size=3 RELOC/tex/latex/appendix/appendix.sty catalogue-ctan /macros/latex/contrib/appendix -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics appendix headings catalogue-version 1.2b ++++++ appendixnumberbeamer.doc.tar.xz ++++++ ++++++ appendixnumberbeamer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/appendixnumberbeamer.tlpobj new/tlpkg/tlpobj/appendixnumberbeamer.tlpobj --- old/tlpkg/tlpobj/appendixnumberbeamer.tlpobj 2016-04-14 18:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/appendixnumberbeamer.tlpobj 2017-04-14 17:27:52.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=1 RELOC/tex/latex/appendixnumberbeamer/appendixnumberbeamer.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/appendixnumberbeamer -catalogue-date 2016-04-07 11:13:32 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics presentation ++++++ apprends-latex.doc.tar.xz ++++++ ++++++ apptools.doc.tar.xz ++++++ ++++++ apptools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apptools.tlpobj new/tlpkg/tlpobj/apptools.tlpobj --- old/tlpkg/tlpobj/apptools.tlpobj 2016-04-14 18:34:56.000000000 +0200 +++ new/tlpkg/tlpobj/apptools.tlpobj 2017-04-14 17:27:53.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/apptools/apptools.sty catalogue-ctan /macros/latex/contrib/apptools -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics appendix catalogue-version 1.0 ++++++ arabi-add.doc.tar.xz ++++++ ++++++ arabi-add.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabi-add.tlpobj new/tlpkg/tlpobj/arabi-add.tlpobj --- old/tlpkg/tlpobj/arabi-add.tlpobj 2016-04-14 18:35:00.000000000 +0200 +++ new/tlpkg/tlpobj/arabi-add.tlpobj 2017-04-14 17:27:55.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/arabi-add/arabi-add.sty catalogue-also arabi catalogue-ctan /language/arabic/arabi-add -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license unknown catalogue-topics arabic catalogue-version 1.0 ++++++ arabi.doc.tar.xz ++++++ ++++++ arabi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabi.tlpobj new/tlpkg/tlpobj/arabi.tlpobj --- old/tlpkg/tlpobj/arabi.tlpobj 2016-04-14 18:34:58.000000000 +0200 +++ new/tlpkg/tlpobj/arabi.tlpobj 2017-04-14 17:27:54.000000000 +0200 @@ -207,7 +207,7 @@ RELOC/tex/latex/arabi/translit.sty catalogue-also arabtex catalogue-ctan /language/arabic/arabi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics arabic multilingual-addon font font-type1 catalogue-version 1.1 ++++++ arabluatex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/arabluatex/arabluatex.el new/doc/lualatex/arabluatex/arabluatex.el --- old/doc/lualatex/arabluatex/arabluatex.el 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/lualatex/arabluatex/arabluatex.el 2017-03-16 23:01:03.000000000 +0100 @@ -0,0 +1,95 @@ +;;; arabluatex.el --- AUCTeX style for `arabluatex.sty' +;; This file is part of the `arabluatex' package + +;; ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX +;; Copyright (C) 2016--2017 Robert Alessi + +;; Please send error reports and suggestions for improvements to Robert +;; Alessi <alessi(a)robertalessi.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 3 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. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see +;; <http://www.gnu.org/licenses/>. + +(defvar LaTeX-arabluatex-package-options + '("voc" "fullvoc" "novoc" "trans") + "Package options for the arabluatex package.") + +(defvar LaTeX-arabluatex-mode-options + '(;; + ("voc") + ("fullvoc") + ("novoc") + ("trans") + ) + "Global or local options.") + +(defvar LaTeX-arabluatex-key-val-options + '(;; + ("mode" ("voc" "fullvoc" "novoc" "trans")) + ("width") + ("gutter") + ("metre") + ("delim" ("true" "false")) + ("utf" ("true" "false"))) + "Key=value options for arabverse environment.") + +(TeX-add-style-hook + "arabluatex" + (lambda () + ;; This package relies on lualatex, so check for it: + (TeX-check-engine-add-engines 'luatex) + (TeX-add-symbols + "aemph" + "SetInputScheme" + '("SetArbEasy" 0) + '("SetArbDflt" 0) + '("SetArbEasy*" 0) + '("SetArbDflt*" 0) + "SetTranslitFont" + "SetTranslitStyle" + "SetTranslitConvention" + "arbup" + '("ArbUpDflt" 0) + '("NoArbUp" 0) + "SetArbUp" + "cap" + "txarb" + '("arb" [ (TeX-arg-eval completing-read "Mode: " + LaTeX-arabluatex-mode-options) ] + t) + "SetHemistichDelim" + '("bayt" 2) + "abjad" + "arbnull" + "abraces" + "LR" + "RL" + "LRmarginpar" + "LRfootnote" + "RLfootnote" + "FixArbFtnmk" + '("setRL" 0) + '("setLR" 0)) + (LaTeX-add-environments + '("arab" LaTeX-env-args + [ (TeX-arg-eval completing-read "Mode: " + LaTeX-arabluatex-mode-options) ] + 0) + "txarab" + '("arabverse" LaTeX-env-args + [ TeX-arg-key-val LaTeX-arabluatex-key-val-options ] 0)) + ) + LaTeX-dialect) + +;;; arabluatex.el ends here Binary files old/doc/lualatex/arabluatex/arabluatex.pdf and new/doc/lualatex/arabluatex/arabluatex.pdf differ Binary files old/doc/lualatex/arabluatex/samples/al-Jahiz.pdf and new/doc/lualatex/arabluatex/samples/al-Jahiz.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/arabluatex/samples/al-Jahiz.tex new/doc/lualatex/arabluatex/samples/al-Jahiz.tex --- old/doc/lualatex/arabluatex/samples/al-Jahiz.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/lualatex/arabluatex/samples/al-Jahiz.tex 2017-04-28 23:20:49.000000000 +0200 @@ -0,0 +1,175 @@ +% +% This file is public domain +% To compile this document, do: +% 'lualatex --shell-escape al-Jahiz' +% +\documentclass[fontsize=12pt, paper=letter, DIV=classic]{scrartcl} +\usepackage{fontspec} +\setmainfont{Old Standard} +\usepackage{filecontents} + +\usepackage{xcolor} +\usepackage[outputdir=TMP]{minted} +\definecolor{bg}{rgb}{0.95,0.95,0.95} +\usepackage{ccicons} + +\usepackage{lineno} +\usepackage{setspace} +\onehalfspacing + +\usepackage{csquotes} +\DeclareQuoteStyle{arabic} +{\rmfamily\textquotedblright}{\rmfamily\textquotedblleft} +{\rmfamily\textquoteright}{\rmfamily\textquoteleft} + +\usepackage[fullvoc]{arabluatex} +\SetArbEasy + +\PassOptionsToPackage{pdfa}{hyperref} +\usepackage{hyperxmp} +\usepackage{hyperref} +\hypersetup{colorlinks, linkcolor=blue, pdfauthor={Robert Alessi}} + +\begin{document} +\begin{filecontents*}{dajaja.tex} +\begin{linenumbers*} + \begin{arab} + kAna \cap{'a}bU 'l-\cap{h}u_dayli 'ahd_A 'il_A \cap{m}uwaysiN + dajAjaTaN. wa-kAnat dajAjatu-hu 'llatI 'ahdA-hA dUna mA kAna + yuttaxa_du li-\cap{m}uwaysiN. wa-l_akinna-hu bi-karami-hi + wa-bi-.husni _hu\-luqi-hi 'a.zhara 'l-ta`ajjuba min simani-hA + wa-.tIbi la.hmi-hA. wa-kAna <\cap{'a}bU 'l-\cap{h}u_dayli> + yu`rafu bi-'l-'imsAki 'l-^sadIdi. fa-qAla: \enquote{wa-kayfa + ra'ayta yA \cap{'a}bA \cap{`i}mrAna tilka 'l-dajA\-jaTa?} + qAla: \enquote{kAnat `ajabaN mina 'l-`ajabi!} fa-yaqUlu: + \enquote{wa-tadrI mA jinsu-hA? wa-tadrI mA sinnu-hA? fa-'inna + 'l-dajAjaTa 'inna-mA ta.tIbu bi-'l-jinsi wa-'l-sinni. wa-tadrI + bi-'ayyi ^say'iN kunnA nusamminu-hA? wa-fI 'ayyi makAniN kunnA + na`lifu-hA?} fa-lA yazAlu fI h_a_dA wa-'l-'A_haru ya.d.haku + .da.hkaN na`rifu-hu na.hnu wa-lA ya`rifu-hu \cap{'a}bU + 'l-\cap{h}u_dayli. + \end{arab} + +\begin{arab} + wa-kAna \cap{'a}bU 'l-\cap{h}u_dayli 'aslama 'l-nAsi .sadraN + wa-'awsa`a-hum _huluqaN wa-'ashala-hum suhUlaTaN. fa-'in _dakarUA + dajAjaTaN, qAla: \enquote{'ayna kAnat yA \cap{'a}bA \cap{`i}mrAna + min tilka 'l-dajA\-jaTi?} fa-'in _dakarUA ba.t.taTaN 'aw `anAqaN + 'aw jazUraN 'aw baqaraTaN, qAla: \enquote{fa-'ayna kAnat h_a_dihi + 'l-jazUru fI 'l-juzuri min tilka 'l-dajAjaTi fI 'l-dajAji!} + wa-'ini istasmana \cap{'a}bU 'l-\cap{h}u_dayli ^say'aN mina + 'l-.tayri wa-'l-bahA'imi, qAla: \enquote{lA wa-'l-l_ahi wa-lA tilka + 'l-dajAjaTu!} wa-'in _dakarUA `u_dUbaTa 'l-^sa.hmi, qAla: + \enquote{`u_dUbaTu 'l-^sa.hmi fI 'l-baqari wa-'l-ba.t.ti wa-bu.tUni + 'l-samaki wa-'l-dajAji, wa-lA siyyamA _d_alika 'l-jinsu mina + 'l-dajAji.} wa-'in _dakarUA mIlAda ^say'iN 'aw qudUma + 'insAniN, qAla: \enquote{kAna _d_alika ba`da 'an 'ahdaytu-hA la-ka + bi-sanaTiN, wa-mA kAna bayna qudUmi fulAniN wa-bayna 'l-ba`_taTi + bi-tilka 'l-dajAjaTi 'illA yawmuN.} wa-kAnat ma_ta\-laN fI + kulli ^say'iN wa-tArI_haN fI kulli ^say'iN. +\end{arab} +\end{linenumbers*} + +\bigskip + +\begin{arab} + \cap{al-jA.hi.zu}, \aemph{\cap{k}itAbu 'l-\cap{b}u_halA'i} +\end{arab} +\end{filecontents*} + +\title{\large\arb{dajAjaTu \cap{'a}bI 'l-\cap{h}u_dayli + 'l-\cap{`a}llAfi}} +\author{} +\date{} + +\titlehead{\textbf{\textsf{arabluatex sample file}} --- \cczero\ This + file is public domain.\\ + \textsf{arabluatex} mode: \texttt{fullvoc} with + \texttt{\textbackslash SetArbEasy}\\ + Full vocalization, the \arb[trans]{sukUn} and the + \arb[trans]{wa.slaT} are expressed, the \arb[trans]{ta^sdId} is + generated, but the \enquote*{classic} \arb[trans]{maddaT} is + discarded (see source code on p.~\pageref{source}).} +\maketitle +\vspace{-1in} +\doublespacing +\setquotestyle{arabic} +\input{dajaja} + +\makeatletter +\def\al@mode{trans} +\makeatother +\SetTranslitConvention{dmg} +\titlehead{\textsf{arabluatex} mode: \texttt{trans} with + \texttt{\textbackslash SetTranslitConvention\{dmg\}} and + \texttt{\textbackslash SetArbEasy}\\ +\emph{Deutsche Morgenländische Gesellschaft} (see source code on +p.~\pageref{source})} +\onehalfspacing +\maketitle +\vspace{-1in} +\setquotestyle{english} +\input{dajaja} + +\makeatletter +\def\al@mode{trans} +\makeatother +\SetTranslitConvention{loc} +\titlehead{\textsf{arabluatex} mode: \texttt{trans} with + \texttt{\textbackslash SetTranslitConvention\{loc\}}\\ +\emph{Library of Congress} (see source code on p.~\pageref{source})} +\maketitle +\vspace{-1in} +\setquotestyle{english} +\input{dajaja} + +\makeatletter +\def\al@mode{trans} +\makeatother +\SetTranslitConvention{arabica} +\titlehead{\textsf{arabluatex} mode: \texttt{trans} with + \texttt{\textbackslash SetTranslitConvention\{arabica\}}\\ +\emph{Journal of Arabic and Islamic Studies} (Arabica, see source code +on p.~\pageref{source})} +\maketitle +\vspace{-1in} +\setquotestyle{english} +\input{dajaja} + +\makeatletter +\def\al@mode{voc} +\makeatother +\singlespacing +\SetTranslitConvention{dmg} +\titlehead{} +\title{\large Source code} +\subtitle{} +\maketitle +\vspace{-1in} + +\label{source} +Here follows the exact source code that has been used to produce the +above presented outputs. Discretionary hyphens +(\mintinline{latex}|\-|) may have been inserted at some points to +prevent lines from overflowing into the right margin. + +\medskip + +\noindent\textbf{\texttt{preamble:}} +\begin{minted}[linenos, bgcolor=bg]{latex} +\usepackage{csquotes} % recommended for inline quotations +\DeclareQuoteStyle{arabic} % then \setquotestyle{arabic} or + % \setquotestyle{english} may be used + {\rmfamily\textquotedblright}{\rmfamily\textquotedblleft} + {\rmfamily\textquoteright}{\rmfamily\textquoteleft} + +\usepackage[fullvoc]{arabluatex} % 'voc', 'fullvoc', 'novoc' or 'trans' +\SetTranslitConvention{dmg} % 'dmg', 'loc' or 'arabica' +\SetArbEasy % ie. discard 'classic' maddah + +\title{\arb{dajAjaTu \cap{'a}bI 'l-\cap{h}u_dayli 'l-\cap{`a}llAfi}} +\end{minted} +\textbf{\texttt{document:}} +\inputminted[linenos, firstnumber=last, bgcolor=bg]{latex}{TMP/dajaja.tex} + +\end{document} Binary files old/doc/lualatex/arabluatex/samples/template-01.pdf and new/doc/lualatex/arabluatex/samples/template-01.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/arabluatex/samples/template-01.tex new/doc/lualatex/arabluatex/samples/template-01.tex --- old/doc/lualatex/arabluatex/samples/template-01.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/lualatex/arabluatex/samples/template-01.tex 2017-04-28 23:20:49.000000000 +0200 @@ -0,0 +1,109 @@ +\documentclass[paper=letter, DIV=classic, headings=small]{scrartcl} + +\usepackage{ccicons} +\usepackage{paralist} + +\usepackage{arabluatex} + +\usepackage{hyperref} +\hypersetup{colorlinks, linkcolor=blue, breaklinks} + +\subject{\textsf{arabluatex} sample files} +\title{The Basics} +\author{Robert Alessi\thanks{\cczero\ This file is public domain.}} + +\begin{document} +\maketitle + +\begin{abstract} + This file demonstrates the basic features of \texttt{arabluatex}. +\end{abstract} + +\section{The less, the better} +\label{sec:less-better} +\textsf{arabluatex} is loaded by one single line in the preamble: +\begin{verbatim} +\usepackage{arabluatex} +\end{verbatim} +That said, there are two subsequent requirements: +\begin{compactenum} +\item An Arabic font: \textsf{arabluatex} tries to load the + \textsf{Amiri} Arabic font which is already part of + \textsf{texlive}. +\item A Roman font that has all the characters that are needed for + the transliteration of the Arabic. +\end{compactenum} + +Once these requirements are met, one may insert Arabic words in +left-to-right paragraphs like so: \verb|\arb{da_hala mubtasimaN}|, +\arb{da_hala mubtasimaN}. Or insert running paragraphs of Arabic text +inside the \verb|arab| environment, like so:--- +\begin{verbatim} +\begin{arab} + 'at_A .sadIquN 'il_A ju.hA ya.tlubu min-hu .himAra-hu li-yarkaba-hu + fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu 'ilay-ka fI + 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN. fa-qAla ju.hA: 'anA 'AsifuN + jiddaN 'annI lA 'asta.tI`u 'an 'u.haqqiqa la-ka ra.gbata-ka + fa-'l-.himAr-u laysa hunA 'l-yawm-a. wa-qabla 'an yutimma ju.hA + kalAma-hu bada'a 'l-.himAr-u yanhaqu fI 'i.s.tabli-hi. fa-qAla la-hu + .sadIqu-hu: 'innI 'asma`u .himAra-ka yA ju.hA yanhaqu. fa-qAla la-hu + ju.hA: .garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu 'l-.himAr-a + wa-tuka_d_diba-nI? +\end{arab} +\end{verbatim} +\begin{arab} + 'at_A .sadIquN 'il_A ju.hA ya.tlubu min-hu .himAra-hu li-yarkaba-hu + fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu 'ilay-ka fI + 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN. fa-qAla ju.hA: 'anA 'AsifuN + jiddaN 'annI lA 'asta.tI`u 'an 'u.haqqiqa la-ka ra.gbata-ka + fa-'l-.himAr-u laysa hunA 'l-yawm-a. wa-qabla 'an yutimma ju.hA + kalAma-hu bada'a 'l-.himAr-u yanhaqu fI 'i.s.tabli-hi. fa-qAla la-hu + .sadIqu-hu: 'innI 'asma`u .himAra-ka yA ju.hA yanhaqu. fa-qAla la-hu + ju.hA: .garIbuN 'amru-ka yA .sadIqI 'a-tu.saddiqu 'l-.himAr-a + wa-tuka_d_diba-nI? +\end{arab} + +\section{Options} +\label{sec:options} +\textsf{arabluatex} may be loaded with four mutually exclusive options:--- +\begin{compactdesc} +\item[voc] To have every short vowel written. This option is loaded by + default. +\item[fullvoc] To have the \arb[trans]{sukUn} and the + \arb[trans]{wa.slaT} expressed in addition to what \verb|voc| + already does. +\item[novoc] To have all the diacritics discarded. +\item[trans] To have the Arabic transliterated into one of the + accepted standards. +\end{compactdesc} +\begin{verbatim} +% <preamble> +\usepackage{arabluatex} % this loads 'voc' by default +\usepackage[voc]{arabluatex} +\usepackage[fullvoc]{arabluatex} +\usepackage[novoc]{arabluatex} +\usepackage[trans]{arabluatex} +\end{verbatim} + +At any point of the document, any mode can be set locally, like so:--- +\begin{verbatim} +English paragraph: To have the \arb[trans]{sukUn} and the + \arb[trans]{wa.slaT} expressed... + +\begin{arab}[trans] % Arabic paragraph + 'at_A .sadIquN 'il_A \cap{j}u.hA ya.tlubu min-hu .himAra-hu + li-yarkaba-hu fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu + 'ilay-ka fI 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN. +\end{arab} +\end{verbatim} + +English paragraph: To have the \arb[trans]{sukUn} and the + \arb[trans]{wa.slaT} expressed... + +\begin{arab}[trans] % Arabic paragraph + 'at_A .sadIquN 'il_A \cap{j}u.hA ya.tlubu min-hu .himAra-hu + li-yarkaba-hu fI safraTiN qa.sIraTiN fa-qAla la-hu: sawfa 'u`Idu-hu + 'ilay-ka fI 'l-masA'-i wa-'adfa`u la-ka 'ujraTaN. +\end{arab} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabluatex.doc.tlpobj new/tlpkg/tlpobj/arabluatex.doc.tlpobj --- old/tlpkg/tlpobj/arabluatex.doc.tlpobj 2016-05-10 23:41:54.000000000 +0200 +++ new/tlpkg/tlpobj/arabluatex.doc.tlpobj 2017-05-08 02:07:34.000000000 +0200 @@ -1,7 +1,12 @@ name arabluatex.doc category Package -revision 40990 +revision 44241 shortdesc doc files of arabluatex relocated 1 -docfiles size=73 +docfiles size=173 + RELOC/doc/lualatex/arabluatex/arabluatex.el RELOC/doc/lualatex/arabluatex/arabluatex.pdf + RELOC/doc/lualatex/arabluatex/samples/al-Jahiz.pdf + RELOC/doc/lualatex/arabluatex/samples/al-Jahiz.tex + RELOC/doc/lualatex/arabluatex/samples/template-01.pdf + RELOC/doc/lualatex/arabluatex/samples/template-01.tex ++++++ arabluatex.tar.xz ++++++ ++++ 3227 lines of diff (skipped) ++++++ arabtex.doc.tar.xz ++++++ ++++++ arabtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabtex.tlpobj new/tlpkg/tlpobj/arabtex.tlpobj --- old/tlpkg/tlpobj/arabtex.tlpobj 2016-04-14 18:35:01.000000000 +0200 +++ new/tlpkg/tlpobj/arabtex.tlpobj 2017-04-14 17:27:56.000000000 +0200 @@ -142,7 +142,7 @@ RELOC/tex/latex/arabtex/xarbsymb.sty RELOC/tex/latex/arabtex/yiddish.sty catalogue-ctan /language/arabic/arabtex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font arabic font-arabic hebrew font-hebrew font-mf catalogue-version 3.17 ++++++ arabxetex.doc.tar.xz ++++++ ++++++ arabxetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabxetex.tlpobj new/tlpkg/tlpobj/arabxetex.tlpobj --- old/tlpkg/tlpobj/arabxetex.tlpobj 2016-04-14 18:35:03.000000000 +0200 +++ new/tlpkg/tlpobj/arabxetex.tlpobj 2017-04-14 17:27:56.000000000 +0200 @@ -96,7 +96,7 @@ RELOC/fonts/misc/xetex/fontmapping/arabxetex/mirrorpunct.tec RELOC/tex/xelatex/arabxetex/arabxetex.sty catalogue-ctan /macros/xetex/latex/arabxetex -catalogue-date 2015-09-04 12:07:48 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics multilingual xetex catalogue-version 1.2.1 ++++++ aramaic-serto.doc.tar.xz ++++++ ++++++ aramaic-serto.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aramaic-serto.tlpobj new/tlpkg/tlpobj/aramaic-serto.tlpobj --- old/tlpkg/tlpobj/aramaic-serto.tlpobj 2016-04-14 18:35:04.000000000 +0200 +++ new/tlpkg/tlpobj/aramaic-serto.tlpobj 2017-04-14 17:27:56.000000000 +0200 @@ -44,7 +44,7 @@ RELOC/tex/latex/aramaic-serto/userto.fd catalogue-also syriac aramaic catalogue-ctan /language/aramaic/serto -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-archaic font-mf font-type1 catalogue-version 1.0 ++++++ arara.doc.tar.xz ++++++ ++++++ arara.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arara.tlpobj new/tlpkg/tlpobj/arara.tlpobj --- old/tlpkg/tlpobj/arara.tlpobj 2016-04-14 18:35:06.000000000 +0200 +++ new/tlpkg/tlpobj/arara.tlpobj 2017-04-14 17:27:57.000000000 +0200 @@ -35,7 +35,7 @@ texmf-dist/scripts/arara/rules/xelatexmk.yaml texmf-dist/scripts/arara/rules/xetex.yaml catalogue-ctan /support/arara -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics compilation catalogue-version 3.0 ++++++ archaeologie.doc.tar.xz ++++++ ++++ 4832 lines of diff (skipped) ++++++ archaeologie.tar.xz ++++++ ++++ 11892 lines of diff (skipped) ++++++ archaic.doc.tar.xz ++++++ ++++++ archaic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/archaic.tlpobj new/tlpkg/tlpobj/archaic.tlpobj --- old/tlpkg/tlpobj/archaic.tlpobj 2016-04-14 18:35:13.000000000 +0200 +++ new/tlpkg/tlpobj/archaic.tlpobj 2017-04-14 17:28:00.000000000 +0200 @@ -133,6 +133,6 @@ RELOC/tex/latex/archaic/ugarite.sty RELOC/tex/latex/archaic/viking.sty catalogue-ctan /fonts/archaic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-archaic ++++++ arcs.doc.tar.xz ++++++ ++++++ arcs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arcs.tlpobj new/tlpkg/tlpobj/arcs.tlpobj --- old/tlpkg/tlpobj/arcs.tlpobj 2016-04-14 18:35:14.000000000 +0200 +++ new/tlpkg/tlpobj/arcs.tlpobj 2017-04-14 17:28:01.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/arcs/arcs.sty catalogue-ctan /macros/latex/contrib/arcs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics linguistic catalogue-version 1 ++++++ arev.doc.tar.xz ++++++ ++++++ arev.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arev.tlpobj new/tlpkg/tlpobj/arev.tlpobj --- old/tlpkg/tlpobj/arev.tlpobj 2016-04-14 18:35:14.000000000 +0200 +++ new/tlpkg/tlpobj/arev.tlpobj 2017-04-14 17:28:01.000000000 +0200 @@ -72,6 +72,6 @@ RELOC/tex/latex/arev/t1fav.fd RELOC/tex/latex/arev/uzavm.fd catalogue-ctan /fonts/arev -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-sans font-maths ++++++ armtex.doc.tar.xz ++++++ ++++++ armtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/armtex.tlpobj new/tlpkg/tlpobj/armtex.tlpobj --- old/tlpkg/tlpobj/armtex.tlpobj 2016-04-14 18:35:16.000000000 +0200 +++ new/tlpkg/tlpobj/armtex.tlpobj 2017-04-14 17:28:03.000000000 +0200 @@ -78,7 +78,7 @@ RELOC/tex/plain/armenian/armkb-a8.tex RELOC/tex/plain/armenian/armkb-u8.tex catalogue-ctan /language/armenian/armtex -catalogue-date 2015-08-13 11:06:58 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics armenian format font font-mf font-type1 catalogue-version 3.0-beta3

1 0

commit texlive for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive for openSUSE:Factory checked in at 2017-06-25 19:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive (Old) and /work/SRC/openSUSE:Factory/.texlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive" Sun Jun 25 19:20:58 2017 rev:36 rq:504155 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2017-06-08 14:57:30.453559182 +0200 +++ /work/SRC/openSUSE:Factory/.texlive.new/texlive.changes 2017-06-25 19:21:02.677503616 +0200 @@ -1,0 +2,28 @@ +Wed Jun 14 12:59:21 UTC 2017 - werner(a)suse.de + +- Let biber test suite not use 64bit longs on 32bit architectures + +------------------------------------------------------------------- +Wed Jun 14 08:10:24 UTC 2017 - werner(a)suse.de + +- Modify patch source-luatex.dif, that is update luatex tree from + version 2017033109 (r44589) to version 2017060901 (r44590) + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 + +------------------------------------------------------------------- +Thu Jun 1 12:02:37 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest +- Update to biber 2.7 + * Add missing bblxml.pm +- Remove patch biber-perl-pre5.22.0.dif +- Add patch source-luatex.dif for new gcc-7.1 +- Adopted patches biber-certs.dif, biblatex-encoding.dif, + source-configure.dif, source-overflow.dif, source-warns.dif, + and source-warns.dif + +------------------------------------------------------------------- Old: ---- biber-perl-pre5.22.0.dif biblatex-biber-2.5.tar.xz texlive-20160523-source.tar.xz New: ---- biblatex-biber-2.7.tar.xz source-luatex.dif texlive-20170520-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive.spec ++++++ ++++ 1092 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive/texlive.spec ++++ and /work/SRC/openSUSE:Factory/.texlive.new/texlive.spec ++++++ biber-certs.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.149012963 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.153012398 +0200 @@ -6,38 +6,38 @@ 4 files changed, 2 insertions(+), 3 deletions(-) --- Build.PL -+++ Build.PL 2016-06-07 14:11:47.318106451 +0000 -@@ -53,7 +53,6 @@ my $builder = $class->new( - 'List::AllUtils' => 0, - 'List::MoreUtils' => 0, - 'List::MoreUtils::XS' => 0, -- 'Mozilla::CA' => '20141217', - 'Regexp::Common' => 0, - 'Log::Log4perl' => 0, - 'Unicode::Collate' => '1.14', ++++ Build.PL 2017-05-30 13:22:55.692794072 +0000 +@@ -54,7 +54,6 @@ my $builder = $class->new( + 'List::AllUtils' => 0, + 'List::MoreUtils' => 0, + 'List::MoreUtils::XS' => 0, +- 'Mozilla::CA' => '20160104', + 'Regexp::Common' => 0, + 'Log::Log4perl' => 0, + 'Unicode::Collate' => '1.18', --- META.json -+++ META.json 2016-06-07 14:12:02.509820834 +0000 -@@ -48,7 +48,6 @@ ++++ META.json 2017-05-30 13:23:19.305046965 +0000 +@@ -49,7 +49,6 @@ "List::MoreUtils" : "0", "List::MoreUtils::XS" : "0", "Log::Log4perl" : "0", -- "Mozilla::CA" : "20141217", +- "Mozilla::CA" : "20160104", "Regexp::Common" : "0", - "Text::BibTeX" : "0.72", - "Text::Roman" : "0", + "Sort::Key" : "0", + "Text::BibTeX" : "0.76", --- META.yml -+++ META.yml 2016-06-07 14:12:11.285655839 +0000 -@@ -93,7 +93,6 @@ requires: ++++ META.yml 2017-05-30 13:23:28.101141166 +0000 +@@ -94,7 +94,6 @@ requires: List::MoreUtils: '0' List::MoreUtils::XS: '0' Log::Log4perl: '0' -- Mozilla::CA: '20141217' +- Mozilla::CA: '20160104' Regexp::Common: '0' - Text::BibTeX: '0.72' - Text::Roman: '0' + Sort::Key: '0' + Text::BibTeX: '0.76' --- bin/biber -+++ bin/biber 2016-06-07 14:00:30.294825957 +0000 -@@ -104,6 +104,8 @@ GetOptions( ++++ bin/biber 2017-05-30 13:22:13.032337114 +0000 +@@ -112,6 +112,8 @@ GetOptions( ) or pod2usage(-verbose => 0, -exitval => EXIT_ERROR); ++++++ biblatex-biber-2.5.tar.xz -> biblatex-biber-2.7.tar.xz ++++++ ++++ 51884 lines of diff (skipped) ++++++ biblatex-encoding.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.452970003 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.452970003 +0200 @@ -5,7 +5,7 @@ 3 files changed, 3 insertions(+) --- lib/Biber/Output/base.pm -+++ lib/Biber/Output/base.pm 2016-01-28 14:18:54.154145820 +0000 ++++ lib/Biber/Output/base.pm 2017-05-30 13:14:49.503601586 +0000 @@ -7,6 +7,7 @@ use Biber::Entry; use Biber::Utils; use Encode; @@ -15,17 +15,17 @@ $Text::Wrap::columns = 80; use Log::Log4perl qw( :no_extra_logdie_message ); --- lib/Biber/Output/bbl.pm -+++ lib/Biber/Output/bbl.pm 2016-01-28 14:19:09.785831193 +0000 ++++ lib/Biber/Output/bbl.pm 2017-05-30 13:19:08.950366953 +0000 @@ -12,6 +12,7 @@ use Biber::Utils; use Encode; use List::AllUtils qw( :all ); use IO::File; +use PerlIO::encoding; use Log::Log4perl qw( :no_extra_logdie_message ); + use Scalar::Util qw(looks_like_number); use Text::Wrap; - use Unicode::Normalize; --- lib/Biber/Output/dot.pm -+++ lib/Biber/Output/dot.pm 2016-01-28 14:19:20.617613177 +0000 ++++ lib/Biber/Output/dot.pm 2017-05-30 13:14:50.359610708 +0000 @@ -10,6 +10,7 @@ use Biber::Entry; use Biber::Utils; use List::AllUtils qw( :all ); ++++++ source-configure.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.504962654 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.504962654 +0200 @@ -1,16 +1,12 @@ --- - configure | 9 --------- + configure | 3 --- configure.ac | 3 --- - libs/configure | 6 ------ - texk/configure | 6 ------ texk/dvipdfm-x/configure | 8 ++++---- texk/dvipdfm-x/configure.ac | 2 +- - texk/dvisvgm/ac/libgs.ac | 3 --- - utils/configure | 6 ------ - 8 files changed, 5 insertions(+), 38 deletions(-) + 4 files changed, 5 insertions(+), 11 deletions(-) --- configure.ac -+++ configure.ac 2016-06-07 12:51:38.568729621 +0000 ++++ configure.ac 2017-05-30 12:46:15.933298946 +0000 @@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([ if test "x$syslib_status" = xno; then AC_MSG_ERROR([some requested system libraries failed]) @@ -22,21 +18,8 @@ AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) --- configure -+++ configure 2016-06-07 12:54:03.241986672 +0000 -@@ -5273,12 +5273,6 @@ if test "${with_libgs_libdir+set}" = set - fi - - --## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ --## configure checks for dvisvgm and libgs --if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then -- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 --fi -- - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ - ## configure options and TL libraries required for gregorio - # Check whether --enable-gregorio was given. -@@ -22181,9 +22175,6 @@ fi ++++ configure 2017-05-30 12:46:15.981299457 +0000 +@@ -22124,9 +22124,6 @@ fi if test "x$syslib_status" = xno; then as_fn_error $? "some requested system libraries failed" "$LINENO" 5 fi @@ -46,49 +29,19 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS ---- libs/configure -+++ libs/configure 2016-06-07 12:54:22.137628386 +0000 -@@ -4471,12 +4471,6 @@ if test "${with_libgs_libdir+set}" = set - fi - - --## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ --## configure checks for dvisvgm and libgs --if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then -- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 --fi -- - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ - ## configure options and TL libraries required for gregorio - # Check whether --enable-gregorio was given. ---- texk/configure -+++ texk/configure 2016-06-07 12:54:40.781274871 +0000 -@@ -4483,12 +4483,6 @@ if test "${with_libgs_libdir+set}" = set - fi - - --## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ --## configure checks for dvisvgm and libgs --if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then -- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 --fi -- - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ - ## configure options and TL libraries required for gregorio - # Check whether --enable-gregorio was given. --- texk/dvipdfm-x/configure.ac -+++ texk/dvipdfm-x/configure.ac 2016-06-07 12:55:15.332619702 +0000 ++++ texk/dvipdfm-x/configure.ac 2017-05-30 12:50:20.711904998 +0000 @@ -7,7 +7,7 @@ dnl This file is free software; the co dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl --AC_INIT([dvipdfm-x (TeX Live)], [20160307], [tex-k(a)tug.org]) -+AC_INIT([dvipdfmx (TeX Live)], [20160307], [tex-k(a)tug.org]) +-AC_INIT([dvipdfm-x (TeX Live)], [20170318], [tex-k(a)tug.org]) ++AC_INIT([dvipdfmx (TeX Live)], [20170318], [tex-k(a)tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) --- texk/dvipdfm-x/configure -+++ texk/dvipdfm-x/configure 2016-06-07 12:56:53.574756684 +0000 ++++ texk/dvipdfm-x/configure 2017-05-30 12:52:21.189194983 +0000 @@ -588,10 +588,10 @@ MFLAGS= MAKEFLAGS= @@ -97,9 +50,9 @@ -PACKAGE_TARNAME='dvipdfm-x--tex-live-' +PACKAGE_NAME='dvipdfmx (TeX Live)' +PACKAGE_TARNAME='dvipdfmx' - PACKAGE_VERSION='20160307' --PACKAGE_STRING='dvipdfm-x (TeX Live) 20160307' -+PACKAGE_STRING='dvipdfmx (TeX Live) 20160307' + PACKAGE_VERSION='20170318' +-PACKAGE_STRING='dvipdfm-x (TeX Live) 20170318' ++PACKAGE_STRING='dvipdfmx (TeX Live) 20170318' PACKAGE_BUGREPORT='tex-k(a)tug.org' PACKAGE_URL='' @@ -109,30 +62,6 @@ # Define the identity of the package. - PACKAGE='dvipdfm-x--tex-live-' + PACKAGE='dvipdfmx' - VERSION='20160307' + VERSION='20170318' ---- texk/dvisvgm/ac/libgs.ac -+++ texk/dvisvgm/ac/libgs.ac 2016-06-07 12:51:38.616728710 +0000 -@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn - dnl You may freely use, modify and/or distribute this file. - dnl - ## configure checks for dvisvgm and libgs --if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then -- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build]) --fi ---- utils/configure -+++ utils/configure 2016-06-07 12:57:20.806240245 +0000 -@@ -4464,12 +4464,6 @@ if test "${with_libgs_libdir+set}" = set - fi - - --## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ --## configure checks for dvisvgm and libgs --if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then -- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 --fi -- - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ - ## configure options and TL libraries required for gregorio - # Check whether --enable-gregorio was given. ++++++ source-luatex.dif ++++++ ++++ 842 lines (skipped) ++++++ source-overflow.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.536958132 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.536958132 +0200 @@ -1,25 +1,7 @@ --- - texk/upmendex/fwrite.c | 62 +++++++++++++++++++++++---------------------- - utils/lacheck/lacheck.test | 3 +- - 2 files changed, 34 insertions(+), 31 deletions(-) + utils/lacheck/lacheck.test | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -|--- texk/web2c/eptexdir/eptex.ech -|+++ texk/web2c/eptexdir/eptex.ech 2012-04-16 08:31:14.564665420 +0000 -|@@ -300,10 +300,13 @@ othercases goto next_p -| hlist_node,vlist_node: begin r:=get_node(box_node_size); -| @z -| @x e-pTeX: just_copy -|+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words} -| words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} -| @y -|- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} -|+ mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; -|+ {copy the last three words} -| add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r)); -|+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} -| @z -| -| @x e-pTeX: ifcsname l.28620 --- utils/lacheck/lacheck.test +++ utils/lacheck/lacheck.test 2016-01-28 12:25:40.958687909 +0000 @@ -6,5 +6,6 @@ @@ -30,101 +12,3 @@ +test -e $srcdir/test.old || > $srcdir/test.old +diff $srcdir/test.old test.out || true ---- texk/upmendex/fwrite.c -+++ texk/upmendex/fwrite.c 2016-07-08 11:54:13.897971000 +0000 -@@ -67,33 +67,38 @@ static inline int SAPPENDF(char *buf, co - - static void fprint_uchar(FILE *fp, const UChar *a, const int mode, const int len) - { -- int k; -- char str[15], *ret; -- UChar istr[5]; -+ char str[3*INITIALLENGTH+1]; -+ UChar istr[INITIALLENGTH]; - int olen, wclen; - UErrorCode perr; - - if (len<0) { -- for (k=0; a[k] || k<4; k++) istr[k]=a[k]; -- wclen=k; -+ u_strcpy(istr,a); -+ wclen=u_strlen(istr); - } else { -- wclen = is_surrogate_pair(a) ? 2 : 1; -+ wclen=is_surrogate_pair(a) ? 2 : 1; - istr[0]=a[0]; - if (wclen==2) istr[1]=a[1]; -+ istr[wclen]=L'\0'; - } -- istr[wclen]=L'\0'; - if (mode==M_TO_UPPER) { -- perr = U_ZERO_ERROR; -- u_strToUpper(istr,5,istr,wclen,"",&perr); -+ perr=U_ZERO_ERROR; -+ olen=u_strToUpper(istr,INITIALLENGTH,istr,wclen,"",&perr); - } else if (mode==M_TO_LOWER) { -- perr = U_ZERO_ERROR; -- u_strToLower(istr,5,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr); -+ perr=U_ZERO_ERROR; -+ olen=u_strToLower(istr,INITIALLENGTH,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr); - } else if (mode==M_TO_TITLE) { -- perr = U_ZERO_ERROR; -- u_strToTitle(istr,5,istr,wclen,NULL,"",&perr); -- } -- perr = U_ZERO_ERROR; -- ret = u_strToUTF8(str, 15, &olen, istr, wclen, &perr); -+ perr=U_ZERO_ERROR; -+ olen=u_strToTitle(istr,INITIALLENGTH,istr,wclen,NULL,"",&perr); -+ } else -+ olen=wclen; -+ if (olen>INITIALLENGTH) { -+ warn_printf(efp, "\nWarning, Too long (%d) header.\n", olen); -+ wclen=INITIALLENGTH; -+ } else -+ wclen=olen; -+ perr=U_ZERO_ERROR; -+ u_strToUTF8(str, 3*INITIALLENGTH+1, &olen, istr, wclen, &perr); - fprintf(fp,"%s",str); - } - -@@ -844,7 +849,7 @@ static int initial_cmp_char(UChar *ini, - static int init_hanzi_header(void) - { - UChar strX[2],*pch0,*pch1; -- int k, hzmode; -+ int k, hzmode, len; - struct hanzi_index *hz_idx_init; - - strX[0]=0x5B57; strX[1]=L'\0'; -@@ -878,21 +883,18 @@ static int init_hanzi_header(void) - for (k=0;k<hz_index_len;k++) { - if (u_strlen(pch0)==0) break; - if ((pch1=u_strchr(pch0,L';'))>0) { -- if (pch1-pch0>=INITIALLENGTH) { -- warn_printf(efp, "\nWarning, Too long hanzi header.\n"); -- break; -- } -- u_strncpy(hz_index[k].idx,pch0,pch1-pch0); -- hz_index[k].idx[pch1-pch0]=L'\0'; -- pch0=pch1+1; -+ len=pch1-pch0; - } else { -- if (u_strlen(pch0)>=INITIALLENGTH) { -- warn_printf(efp, "\nWarning, Too long hanzi header.\n"); -- break; -- } -- u_strcpy(hz_index[k].idx,pch0); -- break; -+ len=u_strlen(pch0); - } -+ if (len>=INITIALLENGTH) { -+ warn_printf(efp, "\nWarning, Too long (%d) hanzi header.\n", len); -+ len=INITIALLENGTH-1; -+ } -+ u_strncpy(hz_index[k].idx,pch0,len); -+ hz_index[k].idx[len]=L'\0'; -+ if (pch1>0) pch0=pch1+1; -+ else break; - } - - return hzmode; ++++++ source-warns.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.556955306 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.560954741 +0200 @@ -23,7 +23,7 @@ am__v_CC_0 = @echo " CC " $@; --- libs/icu/icu-src/source/i18n/decNumber.h +++ libs/icu/icu-src/source/i18n/decNumber.h 2016-06-07 13:29:33.925651292 +0000 -@@ -54,26 +54,30 @@ +@@ -56,26 +56,30 @@ /* For ICU, use one digit per byte, to make it easier to emulate the * old DigitList interface on top of a decNumber */ ++++++ source.dif ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.572953045 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.572953045 +0200 @@ -9,7 +9,7 @@ texk/kpathsea/mktex.opt | 39 ++ texk/kpathsea/mktexlsr | 43 ++ texk/kpathsea/progname.c | 4 - texk/kpathsea/texmf.cnf | 173 +++++++----- + texk/kpathsea/texmf.cnf | 174 +++++++----- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3 texk/ps2pk/pk2bm.c | 35 +- texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 - @@ -27,11 +27,11 @@ texk/web2c/window/x11-Xt.c | 4 texk/xdvik/psgs.c | 22 + texk/xdvik/xdvi-sh.in | 19 + - 28 files changed, 371 insertions(+), 196 deletions(-) + 28 files changed, 374 insertions(+), 194 deletions(-) --- libs/icu/icu-src/source/common/Makefile.in -+++ libs/icu/icu-src/source/common/Makefile.in 2016-06-07 13:40:23.537446416 +0000 -@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION ++++ libs/icu/icu-src/source/common/Makefile.in 2017-05-30 12:59:40.801914534 +0000 +@@ -69,7 +69,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION LDFLAGS += $(LDFLAGSICUUC) # for plugin configuration @@ -41,7 +41,7 @@ # for icu data location ifeq ($(PKGDATA_MODE),common) --- reautoconf -+++ reautoconf 2016-06-07 13:40:23.537446416 +0000 ++++ reautoconf 2017-05-30 12:59:40.801914534 +0000 @@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T # Give users a chance to quit here @@ -52,7 +52,7 @@ AUTOCONF=$TL_AUTOCONF AUTOHEADER=$TL_AUTOHEADER --- texk/dviljk/dvi2xx.c -+++ texk/dviljk/dvi2xx.c 2016-06-07 13:40:23.537446416 +0000 ++++ texk/dviljk/dvi2xx.c 2017-05-30 12:59:40.809914620 +0000 @@ -168,7 +168,18 @@ main(int argc, char *argv[]) setbuf(ERR_STREAM, NULL); @@ -73,7 +73,7 @@ G_progname = kpse_program_name; #else --- texk/kpathsea/c-fopen.h -+++ texk/kpathsea/c-fopen.h 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/c-fopen.h 2017-05-30 12:59:40.809914620 +0000 @@ -38,17 +38,17 @@ /* How to open a binary file for reading: */ @@ -96,7 +96,7 @@ /* How to switch an already open file handle to binary mode. --- texk/kpathsea/c-memstr.h -+++ texk/kpathsea/c-memstr.h 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/c-memstr.h 2017-05-30 12:59:40.817914706 +0000 @@ -37,6 +37,7 @@ /* For ancient systems that lack the system V/ANSI version of the @@ -113,7 +113,7 @@ + #endif /* not KPATHSEA_C_MEMSTR_H */ --- texk/kpathsea/cnf-to-paths.awk -+++ texk/kpathsea/cnf-to-paths.awk 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/cnf-to-paths.awk 2017-05-30 12:59:40.817914706 +0000 @@ -37,7 +37,7 @@ val = $0; sub(/^.*=[ \t]*/, "", val); @@ -124,7 +124,7 @@ if (val ~ /\$SELFAUTO/) { # Replace all semicolons with colons in the SELFAUTO paths we're keeping. --- texk/kpathsea/db.c -+++ texk/kpathsea/db.c 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/db.c 2017-05-30 12:59:40.817914706 +0000 @@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */ string top_dir = (string)xmalloc (len + 1); @@ -153,7 +153,7 @@ len = strlen (line); --- texk/kpathsea/mktex.opt -+++ texk/kpathsea/mktex.opt 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/mktex.opt 2017-05-30 12:59:40.817914706 +0000 @@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':'; # TEMPDIR needs to be unique to each process because of the possibility of two # people running dvips (or whatever) simultaneously. @@ -231,7 +231,7 @@ # Cache values that may be useful for recursive calls. export MT_MKTEX_OPT MT_MKTEX_CNF --- texk/kpathsea/mktexlsr -+++ texk/kpathsea/mktexlsr 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/mktexlsr 2017-05-30 12:59:40.817914706 +0000 @@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':'; # be done before kpsewhich can be called, and thus cannot be put into # mktex.opt. @@ -328,7 +328,7 @@ done --- texk/kpathsea/progname.c -+++ texk/kpathsea/progname.c 2016-06-07 13:40:23.537446416 +0000 ++++ texk/kpathsea/progname.c 2017-05-30 12:59:40.817914706 +0000 @@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse /* SELFAUTODIR is actually the parent of the invocation directory, and SELFAUTOPARENT the grandparent. This is how teTeX did it. */ @@ -342,8 +342,8 @@ sdir_greatgrandparent = xdirname (sdir_grandparent); kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent)); --- texk/kpathsea/texmf.cnf -+++ texk/kpathsea/texmf.cnf 2016-06-07 13:58:00.905630040 +0000 -@@ -57,32 +57,32 @@ ++++ texk/kpathsea/texmf.cnf 2017-05-30 13:09:02.347900901 +0000 +@@ -57,20 +57,20 @@ TEXMFROOT = $SELFAUTOPARENT % The main tree of distributed packages and programs: @@ -368,35 +368,33 @@ % Per-user texmf tree(s) -- organized per the TDS, as usual. To define % more than one per-user tree, set this to a list of directories in - % braces, as described above. (This used to be HOMETEXMF.) ~ expands - % to %USERPROFILE% on Windows, $HOME otherwise. --TEXMFHOME = ~/texmf -+TEXMFHOME = $HOME/texmf +@@ -79,10 +79,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config + TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. --TEXMFVAR = ~/.texlive2016/texmf-var +-TEXMFVAR = ~/.texlive2017/texmf-var +TEXMFVAR = ${TEXMFSYSVAR} % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. --TEXMFCONFIG = ~/.texlive2016/texmf-config +-TEXMFCONFIG = ~/.texlive2017/texmf-config +TEXMFCONFIG = ${TEXMFSYSCONFIG} - % List all the texmf trees. For an explanation of what they are, see the - % TeX Live manual. -@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2016/texmf-confi - % should take precedence over distribution files -- although it is - % generally a source of confusion to have different versions of a - % package installed, whatever the trees, so try to avoid it. --TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} + % This is the value manipulated by tlmgr's auxtrees subcommand in the + % root texmf.cnf. Kpathsea warns about a literally empty string for a +@@ -103,7 +103,7 @@ TEXMFAUXTREES = {} + % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is + % ever defined (the 99% common case), no extra elements will be added to + % the search paths. tlmgr takes care to end any value with a trailing comma. +-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. -@@ -102,24 +102,23 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO +@@ -111,24 +111,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. --TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE % The system trees. These are the trees that are shared by all users. @@ -420,7 +418,7 @@ % On some systems, there will be a system tree which contains all the font % files that may be created as well as the formats. For example -@@ -130,7 +129,8 @@ VARTEXFONTS = $TEXMFVAR/fonts +@@ -139,7 +138,8 @@ VARTEXFONTS = $TEXMFVAR/fonts % % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below % one of the TEXMF directories (avoids overlapping ls-R files). @@ -430,7 +428,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. -@@ -138,7 +138,7 @@ VARTEXFONTS = $TEXMFVAR/fonts +@@ -147,7 +147,7 @@ VARTEXFONTS = $TEXMFVAR/fonts % WEB2C is for Web2C specific files. The current directory may not be % a good place to look for them. @@ -439,7 +437,7 @@ % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input % or \openin, including .sty, .eps, etc. We specify paths for all known -@@ -179,18 +179,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ +@@ -188,18 +188,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// % pdfTeX. @@ -467,8 +465,8 @@ +TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// % LuaTeX. - TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -@@ -238,18 +238,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib + TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +@@ -248,18 +248,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// % jadetex. @@ -493,7 +491,7 @@ % Earlier entries override later ones, so put this generic one last. TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// -@@ -258,7 +258,7 @@ TEXINPUTS = .;$TEXMF/tex/{ +@@ -268,7 +268,7 @@ TEXINPUTS = .;$TEXMF/tex/{ TTF2TFMINPUTS = .;$TEXMF/ttf2pk// % Metafont, MetaPost inputs. @@ -502,7 +500,7 @@ MPINPUTS = .;$TEXMF/metapost// % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. -@@ -268,31 +268,31 @@ MPINPUTS = .;$TEXMF/metapost// +@@ -278,31 +278,31 @@ MPINPUTS = .;$TEXMF/metapost// % We repeat the same definition three times because of the way fmtutil % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats % will not be found. @@ -541,7 +539,7 @@ % Similarly for the GF format, which only remains in existence because % Metafont outputs it (and MF isn't going to change). -@@ -302,7 +302,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD +@@ -312,7 +312,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD GLYPHFONTS = .;$TEXMF/fonts % A place to puth everything that doesn't fit the other font categories. @@ -550,7 +548,7 @@ % font name map files. This isn't just fonts/map// because ConTeXt % wants support for having files with the same name in the different -@@ -384,8 +384,8 @@ MPSUPPORT = .;$TEXMF/metapost/support +@@ -398,8 +398,8 @@ MPSUPPORT = .;$TEXMF/metapost/support % For xdvi to find mime.types and .mailcap, if they do not exist in % ~. These are single directories, not paths. % (But the default mime.types, at least, may well suffice.) @@ -561,7 +559,7 @@ % Default settings for the fontconfig library as used by the Windows % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. -@@ -404,10 +404,10 @@ WEBINPUTS = .;$TEXMF/web// +@@ -418,10 +418,10 @@ WEBINPUTS = .;$TEXMF/web// CWEBINPUTS = .;$TEXMF/cweb// % Omega-related fonts and other files. @@ -576,7 +574,7 @@ OTPINPUTS = .;$TEXMF/omega/otp// OCPINPUTS = .;$TEXMF/omega/ocp// -@@ -490,32 +490,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna +@@ -504,32 +504,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna % explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ @@ -640,15 +638,7 @@ % % For reference, here is the old brace-using definition: %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} -@@ -568,7 +574,6 @@ extractbb,\ - gregorio,\ - kpsewhich,\ - makeindex,\ --mpost,\ - repstopdf,\ - - % we'd like to allow: -@@ -791,3 +796,33 @@ max_cols.gftype = 8191 +@@ -805,3 +811,33 @@ max_cols.gftype = 8191 % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? % Default is 0, to not guess. guess_input_kanji_encoding = 1 @@ -683,7 +673,7 @@ +pool_size.jadetex = 500000 +save_size.jadetex = 15000 --- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc -+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2016-06-07 13:40:23.541446341 +0000 ++++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2017-05-30 12:59:40.825914791 +0000 @@ -67,6 +67,9 @@ # include <io.h> #endif @@ -695,7 +685,7 @@ #define VERSION_OPT 301 --- texk/ps2pk/pk2bm.c -+++ texk/ps2pk/pk2bm.c 2016-06-07 13:54:20.741760758 +0000 ++++ texk/ps2pk/pk2bm.c 2017-05-30 12:59:40.825914791 +0000 @@ -45,7 +45,6 @@ static quarterword lsbf(quarterword u); @@ -778,8 +768,8 @@ - return octal; -} --- texk/texlive/linked_scripts/musixtex/musixtex.lua -+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2016-06-07 13:53:04.291194597 +0000 -@@ -172,14 +172,25 @@ end ++++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2017-05-30 13:11:42.885612642 +0000 +@@ -183,14 +183,25 @@ end -- possible by exploiting the the fact that Lua has two false values. -- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == false "do not process the DVI file" (but stop after TeX) @@ -790,7 +780,7 @@ function defaults() prepmx = "prepmx" pmx = "pmxab" -- tex = "etex" +- tex = "etex" + if base == "pdfmusixtex" then + tex = "pdfetex" + dvips = "" @@ -809,7 +799,7 @@ index = false latex = false --- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh -+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2017-05-30 12:59:40.825914791 +0000 @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' @@ -817,7 +807,7 @@ +umask 022 exec fmtutil --sys ${1+"$@"} --- texk/texlive/linked_scripts/texlive/fmtutil.pl -+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-07 13:47:22.161607756 +0000 ++++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2017-05-30 12:59:40.833914877 +0000 @@ -10,16 +10,16 @@ # History: # Original shell script (C) 2001 Thomas Esser, public domain @@ -840,7 +830,7 @@ require "mktexlsr.pl"; TeX::Update->import(); } -@@ -67,7 +67,7 @@ my @deferred_stdout; +@@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path(); # this function checks by itself whether it is running on windows or not reset_root_home(); @@ -849,7 +839,7 @@ chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); -@@ -346,7 +346,14 @@ sub callback_build_formats { +@@ -361,7 +361,14 @@ sub callback_build_formats { TeXLive::TLWinGoo::maybe_make_ro ($tmpdir); } } else { @@ -864,7 +854,7 @@ } # set up destination directory $opts{'fmtdir'} ||= "$texmfvar/web2c"; -@@ -559,6 +566,7 @@ sub rebuild_one_format { +@@ -576,6 +583,7 @@ sub rebuild_one_format { # check for existence of ini file before doing anything else if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) { # we didn't find the ini file, skip @@ -872,7 +862,7 @@ print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n"); # The original script just skipped it but in TeX Live we expect that # all activated formats are also buildable, thus return failure. -@@ -610,11 +618,15 @@ sub rebuild_one_format { +@@ -635,11 +643,15 @@ sub rebuild_one_format { ",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) { return $FMT_NOTAVAIL; } else { @@ -889,7 +879,7 @@ . "$prgswitch $texargs"; print_verbose("running \`$cmdline' ...\n"); --- texk/texlive/linked_scripts/texlive/updmap-sys.sh -+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2017-05-30 12:59:40.833914877 +0000 @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' @@ -897,7 +887,7 @@ +umask 022 exec updmap --sys ${1+"$@"} --- texk/texlive/tl_scripts/fmtutil.cnf -+++ texk/texlive/tl_scripts/fmtutil.cnf 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/tl_scripts/fmtutil.cnf 2017-05-30 12:59:40.833914877 +0000 @@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc # from context: cont-en pdftex cont-usr.tex -8bit *cont-en.mkii @@ -934,7 +924,7 @@ +xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini +pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini --- texk/texlive/tl_scripts/texconfig-dialog.sh -+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/tl_scripts/texconfig-dialog.sh 2017-05-30 12:59:40.833914877 +0000 @@ -157,7 +157,14 @@ termCtl() ############################################################################### menuMain() @@ -964,7 +954,7 @@ while :; do logMessage='view logfile' --- texk/texlive/tl_scripts/texconfig-sys.sh -+++ texk/texlive/tl_scripts/texconfig-sys.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/tl_scripts/texconfig-sys.sh 2017-05-30 12:59:40.833914877 +0000 @@ -30,4 +30,5 @@ TEXMFVAR="$v" TEXMFCONFIG="$c" export TEXMFVAR TEXMFCONFIG @@ -972,7 +962,7 @@ +umask 022 exec texconfig ${1+"$@"} --- texk/texlive/tl_scripts/texconfig.sh -+++ texk/texlive/tl_scripts/texconfig.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/tl_scripts/texconfig.sh 2017-05-30 12:59:40.833914877 +0000 @@ -40,7 +40,7 @@ envVars=" TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS @@ -982,7 +972,7 @@ needsCleanup=false lastUpdatedFile= -@@ -1010,21 +1010,6 @@ For more information about these \`featu +@@ -975,21 +975,6 @@ For more information about these \`featu ;; formats) @@ -1004,7 +994,7 @@ setupTmpDir echo "$progname: analyzing old configuration..." >&2 fmtutil --catcfg > $tmpdir/pre -@@ -1050,22 +1035,6 @@ EOM +@@ -1015,22 +1000,6 @@ EOM # "hyphen FORMAT" hyphen) @@ -1027,7 +1017,7 @@ tcBatchHyphenFormat=$2 formatsForHyphen=`getFormatsForHyphen` formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'` -@@ -1317,7 +1286,7 @@ Valid PAPER settings: +@@ -1276,7 +1245,7 @@ Valid PAPER settings: ;; rehash) @@ -1037,7 +1027,7 @@ # --- texk/texlive/tl_scripts/texlinks.sh -+++ texk/texlive/tl_scripts/texlinks.sh 2016-06-07 13:40:23.541446341 +0000 ++++ texk/texlive/tl_scripts/texlinks.sh 2017-05-30 12:59:40.841914963 +0000 @@ -100,7 +100,7 @@ setupTmpDir() trap 'cleanup 1' 1 2 3 7 13 15 @@ -1136,7 +1126,7 @@ if test -f "$d/$engine$exeext"; then case $unlink in --- texk/web2c/Makefile.in -+++ texk/web2c/Makefile.in 2016-06-07 13:40:23.545446266 +0000 ++++ texk/web2c/Makefile.in 2017-05-30 12:59:40.929915908 +0000 @@ -3816,7 +3816,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m md5main_CPPFLAGS = -I$(srcdir)/libmd5 md5main_SOURCES = libmd5/md5main.c @@ -1159,7 +1149,7 @@ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f w2c/stamp-h1 --- texk/web2c/window/regis.c -+++ texk/web2c/window/regis.c 2016-06-07 13:40:23.545446266 +0000 ++++ texk/web2c/window/regis.c 2017-05-30 12:59:40.929915908 +0000 @@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol screenrow top, screenrow bottom) @@ -1179,7 +1169,7 @@ left,bottom,ESCAPE); } --- texk/web2c/window/x11-Xlib.c -+++ texk/web2c/window/x11-Xlib.c 2016-06-07 13:40:23.621444844 +0000 ++++ texk/web2c/window/x11-Xlib.c 2017-05-30 12:59:40.929915908 +0000 @@ -73,6 +73,8 @@ static XWMHints wm_hints = { #define BORDER_WIDTH 1 /* Should get this from resource. */ #define DEFAULT_X_POSITION 0 @@ -1206,7 +1196,7 @@ /* Look up the geometry for this window. (Section 10.2 Obtaining X --- texk/web2c/window/x11-Xt.c -+++ texk/web2c/window/x11-Xt.c 2016-06-07 13:40:23.621444844 +0000 ++++ texk/web2c/window/x11-Xt.c 2017-05-30 12:59:40.929915908 +0000 @@ -18,8 +18,8 @@ #define PLANE 0 @@ -1219,7 +1209,7 @@ static Display *mf_display; static Window mf_window; --- texk/xdvik/psgs.c -+++ texk/xdvik/psgs.c 2016-06-07 13:40:23.621444844 +0000 ++++ texk/xdvik/psgs.c 2017-05-30 12:59:40.929915908 +0000 @@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE. #include <sys/time.h> /* for timeval */ @@ -1257,7 +1247,7 @@ GS_pid = vfork(); if (GS_pid == 0) { /* child */ --- texk/xdvik/xdvi-sh.in -+++ texk/xdvik/xdvi-sh.in 2016-06-07 13:40:23.621444844 +0000 ++++ texk/xdvik/xdvi-sh.in 2017-05-30 12:59:40.929915908 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ++++++ texlive-20160523-source.tar.xz -> texlive-20170520-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive/texlive-20160523-source.tar.xz /work/SRC/openSUSE:Factory/.texlive.new/texlive-20170520-source.tar.xz differ: char 26, line 1 ++++++ texlive-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.guoFlN/_old 2017-06-25 19:21:06.608947957 +0200 +++ /var/tmp/diff_new_pack.guoFlN/_new 2017-06-25 19:21:06.608947957 +0200 @@ -1,5 +1,6 @@ addFilter(".*texlive-(collection|scheme)-.*\.noarch:.*suse-filelist-empty.*") -addFilter(".*texlive-(extratools|devel)\.noarch:.*suse-filelist-empty.*") +addFilter(".*texlive-(extratools|devel)\..*:.*suse-filelist-empty.*") +addFilter(".*texlive-bin-devel\..*:.*suse-filelist-empty.*") addFilter(".*texlive.src:.*:.*macro-in-comment.*") addFilter(".*texlive-scheme-.*.noarch:.*:-*summary-not-capitalized.*") addFilter(".*texlive-.*noarch:.*:.*filename-too-long-for-joliet.*")

1 0

commit texlive-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-filesystem for openSUSE:Factory checked in at 2017-06-25 19:20:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-filesystem (Old) and /work/SRC/openSUSE:Factory/.texlive-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-filesystem" Sun Jun 25 19:20:52 2017 rev:19 rq:504154 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-filesystem/texlive-filesystem.changes 2017-06-08 14:53:42.653709816 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-filesystem.new/texlive-filesystem.changes 2017-06-25 19:20:56.262410307 +0200 @@ -1,0 +2,10 @@ +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- collection-genericextra.tar.xz collection-genericrecommended.tar.xz collection-htmlxml.tar.xz collection-langafrican.tar.xz collection-langindic.tar.xz collection-mathextra.tar.xz collection-omega.tar.xz collection-plainextra.tar.xz collection-science.tar.xz scheme-xml.tar.xz New: ---- collection-mathscience.tar.xz collection-plaingeneric.tar.xz scheme-infraonly.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-filesystem.spec ++++++ ++++ 9620 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-filesystem/texlive-filesystem.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-filesystem.new/texlive-filesystem.spec ++++++ collection-basic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-basic.tlpobj new/tlpkg/tlpobj/collection-basic.tlpobj --- old/tlpkg/tlpobj/collection-basic.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-basic.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-basic category Collection -revision 41149 +revision 41616 shortdesc Essential programs and files relocated 1 longdesc These files are regarded as basic for any TeX system, covering @@ -11,12 +11,12 @@ depend bibtex depend cm depend dvipdfmx -depend dvipdfmx-def depend dvips depend enctex depend etex depend etex-pkg depend glyphlist +depend graphics-def depend gsftopk depend hyph-utf8 depend hyphen-base ++++++ collection-bibtexextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-bibtexextra.tlpobj new/tlpkg/tlpobj/collection-bibtexextra.tlpobj --- old/tlpkg/tlpobj/collection-bibtexextra.tlpobj 2016-05-15 03:18:06.000000000 +0200 +++ new/tlpkg/tlpobj/collection-bibtexextra.tlpobj 2017-05-17 02:22:16.000000000 +0200 @@ -1,6 +1,6 @@ name collection-bibtexextra category Collection -revision 41126 +revision 44385 shortdesc BibTeX additional styles relocated 1 longdesc Additional BibTeX styles and bibliography data(bases), notably @@ -23,19 +23,25 @@ depend biblatex-abnt depend biblatex-anonymous depend biblatex-apa +depend biblatex-archaeology +depend biblatex-arthistory-bonn depend biblatex-bookinarticle depend biblatex-bookinother depend biblatex-bwl depend biblatex-caspervector depend biblatex-chem depend biblatex-chicago +depend biblatex-claves depend biblatex-dw depend biblatex-fiwi +depend biblatex-gb7714-2015 depend biblatex-gost depend biblatex-historian depend biblatex-ieee +depend biblatex-ijsra depend biblatex-iso690 depend biblatex-juradiss +depend biblatex-lni depend biblatex-luh-ipw depend biblatex-manuscripts-philology depend biblatex-mla @@ -44,12 +50,16 @@ depend biblatex-musuos depend biblatex-nature depend biblatex-nejm +depend biblatex-nottsclassic depend biblatex-opcit-booktitle +depend biblatex-oxref depend biblatex-philosophy depend biblatex-phys depend biblatex-publist depend biblatex-realauthor +depend biblatex-sbl depend biblatex-science +depend biblatex-shortfields depend biblatex-source-division depend biblatex-subseries depend biblatex-swiss-legal @@ -60,6 +70,7 @@ depend bibtopic depend bibtopicprefix depend bibunits +depend biolett-bst depend bookdb depend breakcites depend cell @@ -86,12 +97,14 @@ depend harvard depend harvmac depend historische-zeitschrift +depend ietfbibs depend ijqc depend inlinebib depend iopart-num depend jneurosci depend jurabib depend ksfh_nat +depend ltb2bib depend listbib depend logreq depend margbib @@ -101,6 +114,7 @@ depend nar depend nmbib depend notes2bib +depend notex-bst depend oscola depend perception depend pnas2009 ++++++ collection-binextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-binextra.tlpobj new/tlpkg/tlpobj/collection-binextra.tlpobj --- old/tlpkg/tlpobj/collection-binextra.tlpobj 2016-04-23 03:16:13.000000000 +0200 +++ new/tlpkg/tlpobj/collection-binextra.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,6 +1,6 @@ name collection-binextra category Collection -revision 40690 +revision 44515 shortdesc TeX auxiliary programs relocated 1 longdesc Various useful, but non-essential, support programs. Includes @@ -29,6 +29,7 @@ depend dviasm depend dvicopy depend dvidvi +depend dviinfox depend dviljk depend dvipng depend dvipos @@ -40,7 +41,9 @@ depend installfont depend lacheck depend latex-git-log +depend latex-papersize depend latex2man +depend latex2nemeth depend latexdiff depend latexfileversion depend latexmk @@ -57,6 +60,7 @@ depend pdfbook2 depend pdfcrop depend pdfjam +depend pdflatexpicscale depend pdftools depend pdfxup depend pfarrei @@ -77,6 +81,7 @@ depend texfot depend texliveonfly depend texloganalyser +depend texosquery depend texware depend tie depend tpic2pdftex ++++++ collection-context.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-context.tlpobj new/tlpkg/tlpobj/collection-context.tlpobj --- old/tlpkg/tlpobj/collection-context.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-context.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-context category Collection -revision 36190 +revision 42330 shortdesc ConTeXt and packages relocated 1 longdesc Hans Hagen's powerful ConTeXt system, http://pragma-ade.com. @@ -8,28 +8,29 @@ depend collection-basic depend context depend jmn +depend context-notes-zh-cn depend context-account depend context-algorithmic depend context-animation depend context-annotation depend context-bnf depend context-chromato +depend context-cmscbf +depend context-cmttbf depend context-construction-plan depend context-cyrillicnumbers depend context-degrade depend context-fancybreak depend context-filter -depend context-fixme depend context-french depend context-fullpage -depend context-games depend context-gantt depend context-gnuplot +depend context-inifile +depend context-layout depend context-letter depend context-lettrine -depend context-lilypond depend context-mathsets -depend context-notes-zh-cn depend context-rst depend context-ruby depend context-simplefonts ++++++ collection-fontsextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-fontsextra.tlpobj new/tlpkg/tlpobj/collection-fontsextra.tlpobj --- old/tlpkg/tlpobj/collection-fontsextra.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-fontsextra.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-fontsextra category Collection -revision 41166 +revision 43356 shortdesc Additional fonts relocated 1 depend collection-basic @@ -18,8 +18,9 @@ depend antt depend archaic depend arev -depend ascii-font +depend arimo depend asapsym +depend ascii-font depend aspectratio depend astro depend augie @@ -29,6 +30,7 @@ depend barcodes depend baskervald depend baskervaldx +depend baskervillef depend bbding depend bbm depend bbm-macros @@ -37,6 +39,7 @@ depend belleek depend bera depend berenisadf +depend beuron depend bguq depend blacklettert1 depend boisik @@ -70,6 +73,7 @@ depend comicneue depend concmath-fonts depend cookingsymbols +depend cormorantgaramond depend countriesofeurope depend courier-scaled depend crimson @@ -116,10 +120,10 @@ depend fontawesome depend fontmfizz depend fonts-churchslavonic -depend old-arrows depend fourier depend fouriernc depend frcursive +depend frederika2016 depend genealogy depend gentium-tug depend gfsartemisia @@ -131,6 +135,7 @@ depend gillcm depend gillius depend gnu-freefont +depend gofonts depend gothic depend greenpoint depend grotesq @@ -174,7 +179,9 @@ depend merriweather depend miama depend mintspirit +depend missaali depend mnsymbol +depend montserrat depend mweights depend newpx depend newtx @@ -189,6 +196,7 @@ depend ocr-b-outline depend ogham depend oinuit +depend old-arrows depend oldlatin depend oldstandard depend opensans @@ -232,13 +240,16 @@ depend tempora depend tengwarscript depend tfrupee +depend tinos depend tpslifonts depend trajan depend txfontsb +depend txuprcal depend typicons depend umtypewriter depend universa depend universalis +depend uppunctlm depend urwchancal depend venturisadf depend wsuipa ++++++ collection-fontsrecommended.tar.xz ++++++ ++++++ collection-fontutils.tar.xz ++++++ ++++++ collection-formatsextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-formatsextra.tlpobj new/tlpkg/tlpobj/collection-formatsextra.tlpobj --- old/tlpkg/tlpobj/collection-formatsextra.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-formatsextra.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,17 +1,30 @@ name collection-formatsextra category Collection -revision 33658 +revision 44177 shortdesc Additional formats relocated 1 longdesc Collected TeX `formats', i.e., large-scale macro packages longdesc designed to be dumped into .fmt files -- excluding the most longdesc common ones, such as latex and context, which have their own -longdesc package(s). +longdesc package(s). It also includes the Aleph engine and related Omega +longdesc formats and packages. depend collection-basic +depend collection-latex depend edmac depend eplain +depend jadetex depend lollipop depend mltex +depend passivetex depend psizzl depend startex depend texsis +depend xmltex +depend xmltexconfig +depend aleph +depend antomega +depend lambda +depend mxedruli +depend omega +depend omegaware +depend otibet ++++++ collection-games.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-games.tlpobj new/tlpkg/tlpobj/collection-games.tlpobj --- old/tlpkg/tlpobj/collection-games.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-games.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-games category Collection -revision 36348 +revision 42992 shortdesc Games typesetting relocated 1 longdesc Setups for typesetting various games, including chess. @@ -31,6 +31,7 @@ depend sgame depend skak depend skaknew +depend soup depend sudoku depend sudokubundle depend xq ++++++ collection-humanities.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-humanities.tlpobj new/tlpkg/tlpobj/collection-humanities.tlpobj --- old/tlpkg/tlpobj/collection-humanities.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-humanities.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-humanities category Collection -revision 39438 +revision 42268 shortdesc Humanities packages relocated 1 longdesc Packages for law, linguistics, social sciences, humanities, @@ -31,6 +31,7 @@ depend leipzig depend lexikon depend lexref +depend ling-macros depend linguex depend liturg depend metrix ++++++ collection-langarabic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langarabic.tlpobj new/tlpkg/tlpobj/collection-langarabic.tlpobj --- old/tlpkg/tlpobj/collection-langarabic.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langarabic.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,10 +1,11 @@ name collection-langarabic category Collection -revision 40201 +revision 44496 shortdesc Arabic relocated 1 longdesc Support for Arabic and Persian. depend collection-basic +depend alkalami depend amiri depend arabi depend arabi-add @@ -21,3 +22,4 @@ depend persian-bib depend simurgh depend tram +depend xepersian ++++++ collection-langchinese.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langchinese.tlpobj new/tlpkg/tlpobj/collection-langchinese.tlpobj --- old/tlpkg/tlpobj/collection-langchinese.tlpobj 2016-04-25 03:14:22.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langchinese.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,11 +1,12 @@ name collection-langchinese category Collection -revision 40728 +revision 42675 shortdesc Chinese relocated 1 longdesc Support for Chinese; additional packages in collection-langcjk. depend collection-langcjk depend arphic +depend arphic-ttf depend asymptote-by-example-zh-cn depend asymptote-faq-zh-cn depend asymptote-manual-zh-cn @@ -18,6 +19,7 @@ depend latex-notes-zh-cn depend lshort-chinese depend texlive-zh-cn +depend texproposal depend xpinyin depend zhmetrics depend zhmetrics-uptex ++++++ collection-langcjk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langcjk.tlpobj new/tlpkg/tlpobj/collection-langcjk.tlpobj --- old/tlpkg/tlpobj/collection-langcjk.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langcjk.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-langcjk category Collection -revision 37224 +revision 43009 shortdesc Chinese/Japanese/Korean (base) relocated 1 longdesc Packages supporting a combination of Chinese, Japanese, Korean, @@ -18,5 +18,6 @@ depend dnp depend garuda-c90 depend norasi-c90 +depend pxtatescale depend xcjk2uni depend zxjafont ++++++ collection-langcyrillic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langcyrillic.tlpobj new/tlpkg/tlpobj/collection-langcyrillic.tlpobj --- old/tlpkg/tlpobj/collection-langcyrillic.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langcyrillic.tlpobj 2017-05-19 02:22:03.000000000 +0200 @@ -1,6 +1,6 @@ name collection-langcyrillic category Collection -revision 41167 +revision 44401 shortdesc Cyrillic relocated 1 longdesc Support for Cyrillic scripts (Bulgarian, Russian, Serbian, @@ -22,6 +22,7 @@ depend eskd depend eskdx depend gost +depend hyphen-belarusian depend hyphen-bulgarian depend hyphen-churchslavonic depend hyphen-mongolian ++++++ collection-langczechslovak.tar.xz ++++++ ++++++ collection-langenglish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langenglish.tlpobj new/tlpkg/tlpobj/collection-langenglish.tlpobj --- old/tlpkg/tlpobj/collection-langenglish.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langenglish.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,9 +1,9 @@ name collection-langenglish category Collection -revision 37500 +revision 43650 shortdesc US and UK English relocated 1 -longdesc Support for (and documentation in) English. +longdesc Support for, and documentation in, English. depend collection-basic depend hyphen-english depend FAQ-en @@ -12,11 +12,14 @@ depend amslatex-primer depend around-the-bend depend ascii-chart +depend biblatex-cheatsheet depend components-of-TeX depend comprehensive depend dickimaw +depend docsurvey depend dtxtut depend first-latex-doc +depend forest-quickstart depend gentle depend guide-to-latex depend happy4th @@ -38,16 +41,15 @@ depend lshort-english depend macros2e depend math-e +depend math-into-latex-4 depend maths-symbols depend memdesign depend metafont-beginners depend metapost-examples -depend mil3 depend patgen2-tutorial depend pictexsum depend plain-doc depend presentations-en -depend pstricks-examples-en depend simplified-latex depend svg-inkscape depend tabulars-e @@ -59,7 +61,7 @@ depend texbytopic depend titlepages depend tlc2 +depend undergradmath depend visualfaq -depend voss-mathmode depend webguide depend xetexref ++++++ collection-langeuropean.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langeuropean.tlpobj new/tlpkg/tlpobj/collection-langeuropean.tlpobj --- old/tlpkg/tlpobj/collection-langeuropean.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langeuropean.tlpobj 2017-05-19 02:22:03.000000000 +0200 @@ -1,6 +1,6 @@ name collection-langeuropean category Collection -revision 39721 +revision 44414 shortdesc Other European languages relocated 1 longdesc Support for a number of European languages; others (Greek, @@ -38,7 +38,6 @@ depend finbib depend gloss-occitan depend hrlatex -depend hyphen-armenian depend hyphen-croatian depend hyphen-danish depend hyphen-dutch ++++++ collection-langfrench.tar.xz ++++++ ++++++ collection-langgerman.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langgerman.tlpobj new/tlpkg/tlpobj/collection-langgerman.tlpobj --- old/tlpkg/tlpobj/collection-langgerman.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langgerman.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,10 +1,11 @@ name collection-langgerman category Collection -revision 40098 +revision 42045 shortdesc German relocated 1 longdesc Support for German. depend collection-basic +depend apalike-german depend babel-german depend bibleref-german depend booktabs-de @@ -33,8 +34,8 @@ depend lshort-german depend lualatex-doc-de depend microtype-de +depend milog depend presentations -depend pstricks-examples depend r_und_s depend templates-fenn depend templates-sommer ++++++ collection-langgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langgreek.tlpobj new/tlpkg/tlpobj/collection-langgreek.tlpobj --- old/tlpkg/tlpobj/collection-langgreek.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langgreek.tlpobj 2017-05-05 02:06:54.000000000 +0200 @@ -1,6 +1,6 @@ name collection-langgreek category Collection -revision 39121 +revision 44192 shortdesc Greek relocated 1 longdesc Support for Greek. ++++++ collection-langitalian.tar.xz ++++++ ++++++ collection-langjapanese.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langjapanese.tlpobj new/tlpkg/tlpobj/collection-langjapanese.tlpobj --- old/tlpkg/tlpobj/collection-langjapanese.tlpobj 2016-05-10 23:42:53.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langjapanese.tlpobj 2017-06-11 02:21:20.000000000 +0200 @@ -1,28 +1,36 @@ name collection-langjapanese category Collection -revision 41002 +revision 44554 shortdesc Japanese relocated 1 -longdesc Support for Japanese; additional packages in collection- -longdesc langcjk. +longdesc Support for Japanese; additional packages in +longdesc collection-langcjk. depend collection-langcjk +depend babel-japanese depend bxbase depend bxcjkjatype +depend bxjalipsum +depend bxjaprnind depend bxjscls +depend bxorigcapt depend convbkmk +depend ifptex depend ipaex -depend japanese depend japanese-otf depend japanese-otf-uptex -depend jfontmaps +depend jlreq depend jsclasses depend lshort-japanese depend luatexja +depend mendex-doc depend pbibtex-base depend platex +depend platex-tools +depend platexcheat depend ptex depend ptex-base depend ptex-fonts +depend ptex-fontmaps depend ptex2pdf depend pxbase depend pxchfon ++++++ collection-langkorean.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langkorean.tlpobj new/tlpkg/tlpobj/collection-langkorean.tlpobj --- old/tlpkg/tlpobj/collection-langkorean.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langkorean.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,10 +1,11 @@ name collection-langkorean category Collection -revision 33790 +revision 42106 shortdesc Korean relocated 1 longdesc Support for Korean; additional packages in collection-langcjk. depend collection-langcjk +depend baekmuk depend cjk-ko depend kotex-oblivoir depend kotex-plain @@ -13,3 +14,5 @@ depend lshort-korean depend nanumtype1 depend uhc +depend unfonts-core +depend unfonts-extra ++++++ collection-langother.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langother.tlpobj new/tlpkg/tlpobj/collection-langother.tlpobj --- old/tlpkg/tlpobj/collection-langother.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langother.tlpobj 2017-05-19 02:22:03.000000000 +0200 @@ -1,35 +1,58 @@ name collection-langother category Collection -revision 31014 +revision 44414 shortdesc Other languages relocated 1 -longdesc Support for languages not otherwise listed, including Thai, -longdesc Vietnamese, Hebrew, Indonesian, and plenty more. The split is -longdesc made simply on the basis of the size of the support, to keep -longdesc both collection sizes and the number of collections reasonable. +longdesc Support for languages not otherwise listed, including Indic, +longdesc Thai, Vietnamese, Hebrew, Indonesian, African languages, and +longdesc plenty more. The split is made simply on the basis of the size +longdesc of the support, to keep both collection sizes and the number of +longdesc collections reasonable. depend collection-basic depend amsldoc-vn depend aramaic-serto -depend babel-bahasa +depend hyphen-armenian +depend babel-azerbaijani depend babel-esperanto depend babel-georgian depend babel-hebrew +depend babel-indonesian depend babel-interlingua +depend babel-malay depend babel-sorbian depend babel-thai depend babel-vietnamese +depend bangtex +depend bengali +depend burmese depend cjhebrew depend ctib +depend ebong +depend ethiop +depend ethiop-t1 +depend fc depend fonts-tlwg depend hyphen-afrikaans depend hyphen-coptic depend hyphen-esperanto +depend hyphen-ethiopic depend hyphen-georgian +depend hyphen-indic depend hyphen-indonesian depend hyphen-interlingua +depend hyphen-sanskrit depend hyphen-thai depend hyphen-turkmen +depend latexbangla depend lshort-thai depend lshort-vietnamese depend ntheorem-vn +depend padauk +depend sanskrit +depend sanskrit-t1 +depend thaienum +depend velthuis depend vntex +depend wnri +depend wnri-latex +depend xetex-devanagari ++++++ collection-langpolish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langpolish.tlpobj new/tlpkg/tlpobj/collection-langpolish.tlpobj --- old/tlpkg/tlpobj/collection-langpolish.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-langpolish.tlpobj 2017-05-16 02:22:12.000000000 +0200 @@ -1,12 +1,13 @@ name collection-langpolish category Collection -revision 30372 +revision 44371 shortdesc Polish relocated 1 longdesc Support for Polish. depend collection-latex depend collection-basic depend babel-polish +depend bredzenie depend cc-pl depend gustlib depend gustprog ++++++ collection-langportuguese.tar.xz ++++++ ++++++ collection-langspanish.tar.xz ++++++ ++++++ collection-latex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latex.tlpobj new/tlpkg/tlpobj/collection-latex.tlpobj --- old/tlpkg/tlpobj/collection-latex.tlpobj 2016-05-10 23:42:53.000000000 +0200 +++ new/tlpkg/tlpobj/collection-latex.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,6 +1,6 @@ name collection-latex category Collection -revision 41011 +revision 41614 shortdesc LaTeX fundamental packages relocated 1 longdesc These packages are either mandated by the core LaTeX team, or @@ -14,7 +14,6 @@ depend babelbib depend carlisle depend colortbl -depend dvisvgm-def depend fancyhdr depend fix2col depend geometry @@ -30,7 +29,6 @@ depend mptopdf depend natbib depend oberdiek -depend pdftex-def depend pslatex depend psnfss depend pspicture ++++++ collection-latexextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latexextra.tlpobj new/tlpkg/tlpobj/collection-latexextra.tlpobj --- old/tlpkg/tlpobj/collection-latexextra.tlpobj 2016-06-07 17:33:43.000000000 +0200 +++ new/tlpkg/tlpobj/collection-latexextra.tlpobj 2017-06-10 02:21:29.000000000 +0200 @@ -1,6 +1,6 @@ name collection-latexextra category Collection -revision 41304 +revision 44544 shortdesc LaTeX additional packages relocated 1 longdesc A very large collection of add-on packages for LaTeX. @@ -21,6 +21,8 @@ depend acronym depend acroterm depend actuarialangle +depend actuarialsymbol +depend addfont depend addlines depend adjmulticol depend adjustbox @@ -48,6 +50,7 @@ depend assignment depend assoccnt depend attachfile +depend aurl depend authoraftertitle depend authorindex depend autonum @@ -64,6 +67,7 @@ depend beamerdarkthemes depend beamerposter depend beamersubframe +depend beamertheme-cuerna depend beamertheme-detlevcm depend beamertheme-epyt depend beamertheme-metropolis @@ -79,6 +83,7 @@ depend bibletext depend bigfoot depend bigints +depend biochemistry-colors depend bizcard depend blindtext depend blkarray @@ -99,6 +104,7 @@ depend breakurl depend bullcntr depend bussproofs +depend bxcalc depend bxdpx-beamer depend bxdvidriver depend bxenclose @@ -138,12 +144,14 @@ depend chapterfolder depend chet depend chextras +depend childdoc depend chkfloat depend chletter depend chngcntr depend chronology depend circ depend classics +depend classpack depend clefval depend cleveref depend clipboard @@ -178,7 +186,9 @@ depend continue depend contour depend contracard +depend conv-xkv depend cooking +depend cooking-units depend cool depend coollist depend coolstr @@ -196,8 +206,10 @@ depend crbox depend crossreference depend csquotes +depend css-colors depend csvsimple depend cuisine +depend currency depend currfile depend currvita depend cutwin @@ -285,8 +297,10 @@ depend dprogress depend drac depend draftcopy +depend draftfigure depend draftwatermark depend dtk +depend dtxdescribe depend dtxgallery depend dvdcoll depend dynamicnumber @@ -295,6 +309,7 @@ depend easy depend easy-todo depend easyfig +depend easyformat depend easylist depend easyreview depend ebezier @@ -331,6 +346,7 @@ depend epiolmec depend eqell depend eqlist +depend eqnalign depend eqname depend eqparbox depend errata @@ -343,6 +359,7 @@ depend etoc depend etoolbox depend eukdate +depend eulerpx depend europasscv depend europecv depend everyhook @@ -372,12 +389,13 @@ depend fancytooltips depend fcolumn depend ffslides +depend fgruler depend fibeamer depend fifo-stack depend figsize depend filecontents +depend filecontentsdef depend filedate -depend filehook depend fileinfo depend filemod depend fink @@ -411,6 +429,7 @@ depend fontaxes depend fonttable depend footmisc +depend footmisx depend footnotebackref depend footnotehyper depend footnoterange @@ -433,6 +452,7 @@ depend fundus-calligra depend fundus-cyr depend fundus-sueterlin +depend fvextra depend fwlw depend g-brief depend gauss @@ -443,6 +463,7 @@ depend getfiledate depend getitems depend ginpenc +depend gitfile-info depend gitinfo depend gitinfo2 depend gitlog @@ -469,11 +490,13 @@ depend graphbox depend graphicx-psmin depend graphicxbox +depend grayhints depend grfpaste depend grid depend grid-system depend gridset depend guitlogo +depend halloweenmath depend handout depend hang depend hanging @@ -532,11 +555,13 @@ depend kantlipsum depend kerntest depend keycommand +depend keyfloat depend keyreader depend keystroke depend keyval2e depend keyvaltable depend kix +depend knowledge depend koma-moderncvclassic depend koma-script-sfs depend komacv @@ -548,6 +573,7 @@ depend lastpage depend latex-tds depend latexdemo +depend latexgit depend layouts depend lazylist depend lcd @@ -608,6 +634,7 @@ depend manuscript depend marginfix depend marginnote +depend markdown depend mathalfa depend mathastext depend mathexam @@ -615,6 +642,7 @@ depend mbenotes depend mcaption depend mceinleger +depend mcexam depend mcite depend mciteplus depend mdframed @@ -631,6 +659,7 @@ depend mftinc depend midpage depend minibox +depend minidocument depend minifp depend minipage-marginpar depend minitoc @@ -645,6 +674,7 @@ depend moderntimeline depend modref depend modroman +depend modular depend monofill depend moodle depend moreenum @@ -655,6 +685,7 @@ depend morewrites depend movie15 depend mparhack +depend mpostinl depend msc depend msg depend mslapa @@ -703,6 +734,7 @@ depend nopageno depend normalcolor depend notes +depend notespages depend notoccite depend nowidow depend nox @@ -710,6 +742,7 @@ depend numberedblock depend numname depend numprint +depend numspell depend ocg-p depend ocgx depend ocgx2 @@ -718,11 +751,13 @@ depend oldstyle depend onlyamsmath depend opcit +depend optidef depend optional depend options depend outline depend outliner depend outlines +depend overlays depend overpic depend pagecolor depend pagecont @@ -763,7 +798,15 @@ depend perltex depend permute depend petiteannonce +depend phffullpagefigure +depend phfnote +depend phfparen +depend phfqit +depend phfquotetext +depend phfsvnwatermark +depend phfthm depend philex +depend phonenumbers depend photo depend piff depend pkgloader @@ -794,11 +837,13 @@ depend psfragx depend pst-pdf depend pstool +depend pstring depend pxgreeks depend python depend qcm depend qstest depend qsymbols +depend quicktype depend quotchap depend quoting depend quotmark @@ -842,6 +887,7 @@ depend rtkinenc depend rulercompass depend rvwrite +depend sanitize-umlaut depend sauerj depend savefnmark depend savesym @@ -858,10 +904,12 @@ depend seealso depend selectp depend semantic +depend semantic-markup depend semioneside depend semproc depend sepfootnotes depend seqsplit +depend sesstime depend sf298 depend sffms depend sfmath @@ -918,6 +966,7 @@ depend stringstrings depend sttools depend stubs +depend studenthandouts depend subdepth depend subeqn depend subeqnarray @@ -965,6 +1014,7 @@ depend termcal depend termlist depend testhyphens +depend testidx depend tex-label depend texlogos depend texmate @@ -973,7 +1023,6 @@ depend texshade depend texvc depend textfit -depend textgreek depend textmerg depend textpos depend theoremref @@ -993,6 +1042,7 @@ depend titlesec depend titling depend tocbibind +depend tocdata depend tocloft depend tocvsec2 depend todo @@ -1016,6 +1066,7 @@ depend type1cm depend typed-checklist depend typeface +depend typoaid depend typogrid depend uassign depend ucs @@ -1030,7 +1081,9 @@ depend upquote depend uri depend ushort +depend uspace depend uwmslide +depend variablelm depend varindex depend varsfromjobname depend varwidth @@ -1058,10 +1111,14 @@ depend widetable depend williams depend withargs +depend wordcount depend wordlike depend wrapfig +depend wtref depend xargs depend xassoccnt +depend xcntperchap +depend xcolor-material depend xcolor-solarized depend xcomment depend xdoc @@ -1078,11 +1135,13 @@ depend xprintlen depend xpunctuate depend xsavebox +depend xsim depend xstring depend xtab depend xwatermark depend xytree depend yafoot +depend yaletter depend yagusylo depend ycbook depend ydoc ++++++ collection-latexrecommended.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latexrecommended.tlpobj new/tlpkg/tlpobj/collection-latexrecommended.tlpobj --- old/tlpkg/tlpobj/collection-latexrecommended.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-latexrecommended.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name collection-latexrecommended category Collection -revision 35765 +revision 44177 shortdesc LaTeX recommended packages relocated 1 longdesc A collection of recommended add-on packages for LaTeX which @@ -22,17 +22,21 @@ depend fancybox depend fancyref depend fancyvrb +depend filehook depend float depend fontspec depend fp depend index depend jknapltx depend koma-script +depend latexbug +depend l3experimental depend l3kernel depend l3packages -depend l3experimental depend lineno depend listings +depend lwarp +depend mathspec depend mathtools depend mdwtools depend memoir @@ -42,10 +46,10 @@ depend ntgclass depend parskip depend pdfpages +depend polyglossia depend powerdot depend psfrag depend rcs -depend rotating depend sansmath depend section depend seminar @@ -56,5 +60,8 @@ depend thumbpdf depend typehtml depend underscore +depend unicode-math depend xcolor depend xkeyval +depend xltxtra +depend xunicode ++++++ collection-luatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-luatex.tlpobj new/tlpkg/tlpobj/collection-luatex.tlpobj --- old/tlpkg/tlpobj/collection-luatex.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-luatex.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,6 +1,6 @@ name collection-luatex category Collection -revision 39902 +revision 44500 shortdesc LuaTeX packages relocated 1 longdesc Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using @@ -10,6 +10,8 @@ depend checkcites depend chickenize depend cloze +depend combofont +depend cstypo depend ctablestack depend enigma depend interpreter @@ -19,6 +21,7 @@ depend luabibentry depend luabidi depend luacode +depend luahyphenrules depend luaindex depend luainputenc depend luaintro @@ -27,14 +30,15 @@ depend lualibs depend luamplib depend luaotfload +depend luapackageloader depend luasseq -depend luatex-def depend luatex85 depend luatexbase depend luatexko depend luatextra depend luatodonotes depend luaxml +depend nodetree depend odsfile depend placeat depend selnolig ++++++ collection-metapost.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-metapost.tlpobj new/tlpkg/tlpobj/collection-metapost.tlpobj --- old/tlpkg/tlpobj/collection-metapost.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collection-metapost.tlpobj 2017-05-12 02:07:12.000000000 +0200 @@ -1,6 +1,6 @@ name collection-metapost category Collection -revision 39729 +revision 44297 shortdesc MetaPost and Metafont packages relocated 1 depend collection-basic @@ -35,6 +35,7 @@ depend mpattern depend mpcolornames depend mpgraphics +depend mptrees depend piechartmp depend repere depend roex ++++++ collection-music.tar.xz ++++++ ++++++ collection-pictures.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-pictures.tlpobj new/tlpkg/tlpobj/collection-pictures.tlpobj --- old/tlpkg/tlpobj/collection-pictures.tlpobj 2016-04-22 01:22:45.000000000 +0200 +++ new/tlpkg/tlpobj/collection-pictures.tlpobj 2017-05-18 02:22:02.000000000 +0200 @@ -1,6 +1,6 @@ name collection-pictures category Collection -revision 40656 +revision 44395 shortdesc Graphics, pictures, diagrams relocated 1 longdesc Including TikZ, pict, etc., but MetaPost and PStricks are @@ -12,6 +12,8 @@ depend asypictureb depend autoarea depend bardiag +depend beamerswitch +depend binarytree depend blochsphere depend bloques depend blox @@ -21,6 +23,7 @@ depend braids depend bxeepic depend cachepic +depend callouts depend celtic depend chemfig depend combinedgraphics @@ -36,6 +39,7 @@ depend dratex depend drs depend duotenzor +depend ecgdraw depend eepic depend ellipse depend epspdf @@ -53,6 +57,7 @@ depend gradientframe depend grafcet depend graphviz +depend gtrlib-largetrees depend harveyballs depend here depend hf-tikz @@ -60,10 +65,12 @@ depend hvfloat depend knitting depend knittingpattern +depend ladder depend lapdf depend latex-make depend lpic depend lroundrect +depend luamesh depend makeshape depend mathspic depend miniplot @@ -102,11 +109,14 @@ depend rviewport depend sa-tikz depend schemabloc +depend scsnowman +depend scratch depend setdeck depend signchart depend smartdiagram depend spath3 depend swimgraf +depend table-fct depend texdraw depend ticollege depend tipfr @@ -117,7 +127,10 @@ depend tikz-dimline depend tikz-feynman depend tikz-inet +depend tikz-kalender depend tikz-opm +depend tikz-optics +depend tikz-page depend tikz-palattice depend tikz-qtree depend tikz-timing @@ -126,6 +139,7 @@ depend tikzorbital depend tikzpagenodes depend tikzpfeile +depend tikzpeople depend tikzposter depend tikzscale depend tikzsymbols ++++++ collection-pstricks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-pstricks.tlpobj new/tlpkg/tlpobj/collection-pstricks.tlpobj --- old/tlpkg/tlpobj/collection-pstricks.tlpobj 2016-04-25 03:14:22.000000000 +0200 +++ new/tlpkg/tlpobj/collection-pstricks.tlpobj 2017-06-06 02:21:52.000000000 +0200 @@ -1,11 +1,11 @@ name collection-pstricks category Collection -revision 40724 +revision 44460 shortdesc PSTricks relocated 1 longdesc PSTricks core and all add-on packages. depend collection-basic -depend collection-genericrecommended +depend collection-plaingeneric depend auto-pst-pdf depend bclogo depend dsptricks @@ -18,6 +18,7 @@ depend pst-3d depend pst-3dplot depend pst-abspos +depend pst-arrow depend pst-am depend pst-asr depend pst-bar @@ -75,12 +76,14 @@ depend pst-pulley depend pst-qtree depend pst-rubans +depend pst-shell depend pst-sigsys depend pst-slpe depend pst-solarsystem depend pst-solides3d depend pst-soroban depend pst-spectra +depend pst-spinner depend pst-spirograph depend pst-stru depend pst-support @@ -91,12 +94,14 @@ depend pst-tvz depend pst-uml depend pst-vectorian +depend pst-vehicle depend pst-vowel depend pst-vue3d depend pst2pdf depend pstricks depend pstricks-add depend pstricks_calcnotes +depend rputover depend uml depend vaucanson-g depend vocaltract ++++++ collection-publishers.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-publishers.tlpobj new/tlpkg/tlpobj/collection-publishers.tlpobj --- old/tlpkg/tlpobj/collection-publishers.tlpobj 2016-05-10 23:42:53.000000000 +0200 +++ new/tlpkg/tlpobj/collection-publishers.tlpobj 2017-06-06 02:21:52.000000000 +0200 @@ -1,6 +1,6 @@ name collection-publishers category Collection -revision 41010 +revision 44485 shortdesc Publisher styles, theses, etc. relocated 1 depend collection-latex @@ -26,7 +26,9 @@ depend articleingud depend asaetr depend ascelike +depend aucklandthesis depend bangorcsthesis +depend bangorexam depend beamer-FUBerlin depend beamer-verona depend bgteubner @@ -34,10 +36,12 @@ depend brandeis-dissertation depend cascadilla depend chem-journal +depend cje depend classicthesis depend cleanthesis depend cmpj depend confproc +depend cquthesis depend dccpaper depend dithesis depend ebook @@ -57,16 +61,20 @@ depend gaceta depend gatech-thesis depend gradstudentresume +depend grant depend gsemthesis depend gzt depend h2020proposal depend har2nat depend hobete +depend hustthesis depend icsv depend ieeepes depend ijmart +depend ijsra depend imac depend imtekda +depend iscram depend jacow depend jmlr depend jpsj @@ -74,6 +82,8 @@ depend kluwer depend ksp-thesis depend langsci +depend lion-msc +depend lni depend lps depend matc3 depend matc3mem @@ -81,13 +91,16 @@ depend mentis depend mnras depend msu-thesis +depend mucproc depend mugsthesis depend musuos depend muthesis depend mynsfc depend nature +depend navydocs depend nddiss depend ndsu-thesis +depend novel depend nwejm depend nih depend nihbiosketch @@ -108,6 +121,7 @@ depend resumecls depend revtex depend revtex4 +depend rutitlepage depend ryethesis depend sageep depend sapthesis @@ -142,9 +156,11 @@ depend ucdavisthesis depend ucthesis depend uestcthesis +depend uhhassignment depend uiucredborder depend uiucthesis depend ulthese +depend umbclegislation depend umthesis depend umich-thesis depend unamth-template ++++++ collection-xetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-xetex.tlpobj new/tlpkg/tlpobj/collection-xetex.tlpobj --- old/tlpkg/tlpobj/collection-xetex.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/collection-xetex.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -1,12 +1,13 @@ name collection-xetex category Collection -revision 40404 +revision 43059 shortdesc XeTeX and packages relocated 1 longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by longdesc Jonathan Kew, http://tug.org/xetex. depend collection-basic depend arabxetex +depend awesomebox depend bidi-atbegshi depend bidicontour depend bidipagegrid @@ -17,24 +18,23 @@ depend fontbook depend fontwrap depend interchar -depend mathspec depend philokalia -depend polyglossia depend ptext depend quran depend realscripts +depend simple-resume-cv +depend simple-thesis-dissertation depend ucharclasses +depend unicode-bidi depend unisugar depend xebaposter depend xecjk depend xecolor depend xecyr depend xeindex -depend xepersian depend xesearch depend xespotcolor depend xetex -depend xetex-def depend xetex-itrans depend xetex-pstricks depend xetex-tibetan @@ -42,5 +42,3 @@ depend xetexfontinfo depend xetexko depend xevlna -depend xltxtra -depend xunicode ++++++ scheme-basic.tar.xz ++++++ ++++++ scheme-context.tar.xz ++++++ ++++++ scheme-full.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-full.tlpobj new/tlpkg/tlpobj/scheme-full.tlpobj --- old/tlpkg/tlpobj/scheme-full.tlpobj 2016-04-14 19:45:43.000000000 +0200 +++ new/tlpkg/tlpobj/scheme-full.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,6 +1,6 @@ name scheme-full category Scheme -revision 33790 +revision 44177 shortdesc full scheme (everything) relocated 1 longdesc This is the full TeX Live scheme: it installs everything @@ -14,11 +14,7 @@ depend collection-formatsextra depend collection-fontutils depend collection-games -depend collection-genericextra -depend collection-genericrecommended -depend collection-htmlxml depend collection-humanities -depend collection-langafrican depend collection-langarabic depend collection-langchinese depend collection-langcjk @@ -29,7 +25,6 @@ depend collection-langfrench depend collection-langgerman depend collection-langgreek -depend collection-langindic depend collection-langitalian depend collection-langjapanese depend collection-langkorean @@ -41,14 +36,12 @@ depend collection-latexextra depend collection-latexrecommended depend collection-luatex -depend collection-mathextra +depend collection-mathscience depend collection-metapost depend collection-music -depend collection-omega depend collection-pictures -depend collection-plainextra +depend collection-plaingeneric depend collection-pstricks depend collection-publishers -depend collection-science depend collection-texworks depend collection-xetex ++++++ scheme-gust.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-gust.tlpobj new/tlpkg/tlpobj/scheme-gust.tlpobj --- old/tlpkg/tlpobj/scheme-gust.tlpobj 2016-04-14 19:45:43.000000000 +0200 +++ new/tlpkg/tlpobj/scheme-gust.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,6 +1,6 @@ name scheme-gust category Scheme -revision 30372 +revision 44177 shortdesc GUST TeX Live scheme relocated 1 longdesc This is the GUST TeX Live scheme: it is a set of files @@ -33,10 +33,10 @@ depend collection-context depend collection-fontutils depend collection-fontsrecommended -depend collection-genericrecommended depend collection-langpolish depend collection-latex depend collection-latexrecommended depend collection-metapost +depend collection-plaingeneric depend collection-texworks depend collection-xetex ++++++ scheme-medium.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-medium.tlpobj new/tlpkg/tlpobj/scheme-medium.tlpobj --- old/tlpkg/tlpobj/scheme-medium.tlpobj 2016-04-14 19:45:43.000000000 +0200 +++ new/tlpkg/tlpobj/scheme-medium.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,6 +1,6 @@ name scheme-medium category Scheme -revision 30457 +revision 44177 shortdesc medium scheme (small + more packages and languages) relocated 1 longdesc This is the medium TeX Live collection: it contains plain TeX, @@ -11,7 +11,6 @@ depend collection-context depend collection-fontsrecommended depend collection-fontutils -depend collection-genericrecommended depend collection-langczechslovak depend collection-langenglish depend collection-langeuropean @@ -24,8 +23,8 @@ depend collection-latex depend collection-latexrecommended depend collection-luatex -depend collection-mathextra +depend collection-mathscience depend collection-metapost -depend collection-plainextra +depend collection-plaingeneric depend collection-texworks depend collection-xetex ++++++ scheme-minimal.tar.xz ++++++ ++++++ scheme-small.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-small.tlpobj new/tlpkg/tlpobj/scheme-small.tlpobj --- old/tlpkg/tlpobj/scheme-small.tlpobj 2016-05-20 03:16:04.000000000 +0200 +++ new/tlpkg/tlpobj/scheme-small.tlpobj 2017-04-14 18:00:12.000000000 +0200 @@ -1,6 +1,6 @@ name scheme-small category Scheme -revision 41261 +revision 41825 shortdesc small scheme (basic + xetex, metapost, a few languages) relocated 1 longdesc This is a small TeX Live scheme, corresponding to MacTeX's ++++++ scheme-tetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-tetex.tlpobj new/tlpkg/tlpobj/scheme-tetex.tlpobj --- old/tlpkg/tlpobj/scheme-tetex.tlpobj 2016-04-14 19:45:43.000000000 +0200 +++ new/tlpkg/tlpobj/scheme-tetex.tlpobj 2017-05-05 02:06:56.000000000 +0200 @@ -1,6 +1,6 @@ name scheme-tetex category Scheme -revision 32952 +revision 44187 shortdesc teTeX scheme (more than medium, but nowhere near full) relocated 1 longdesc TeX Live scheme nearly equivalent to the teTeX distribution @@ -41,12 +41,10 @@ depend tamethebeast depend tds depend tex-refs -depend voss-mathmode depend collection-basic depend collection-context depend collection-fontsrecommended depend collection-fontutils -depend collection-genericrecommended depend collection-langcjk depend collection-langcyrillic depend collection-langczechslovak @@ -62,9 +60,9 @@ depend collection-langspanish depend collection-latex depend collection-latexrecommended -depend collection-mathextra +depend collection-mathscience depend collection-metapost -depend collection-omega +depend collection-formatsextra depend collection-pictures -depend collection-plainextra +depend collection-plaingeneric depend collection-pstricks

1 0

commit perl-Text-BibTeX for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package perl-Text-BibTeX for openSUSE:Factory checked in at 2017-06-25 19:20:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Text-BibTeX (Old) and /work/SRC/openSUSE:Factory/.perl-Text-BibTeX.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Text-BibTeX" Sun Jun 25 19:20:38 2017 rev:11 rq:503645 version:0.80 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Text-BibTeX/perl-Text-BibTeX.changes 2016-06-12 18:51:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Text-BibTeX.new/perl-Text-BibTeX.changes 2017-06-25 19:20:39.896723382 +0200 @@ -1,0 +2,80 @@ +Wed May 31 07:32:43 UTC 2017 - werner(a)suse.de + +- Remove patches now upstream + * Text-BibTeX-rpmlint.patch + * perl-Text-BibTeX-uninit.patch +- Add file cpanspec.yml +- Make if build +- Add patch manual-pages-for-libbtparse.patch to get API manual + pages for libbtparse into third section as well +- Split package for libbtparse.so off from main package + +------------------------------------------------------------------- +Thu May 25 09:15:08 UTC 2017 - coolo(a)suse.com + +- updated to 0.80 + see /usr/share/doc/packages/perl-Text-BibTeX/Changes + + 0.80 2017-03-25 + * Fix tests in order to work without dot in @INC (thanks Kent Fredric for the bug report) + + 0.79 2017-03-13 + * Further fixes to allow the parse of multiple files (Karl Wette). + + 0.78 2017-01-10 + * Fixed some issues with uninitialized arrays and s390 + * Fixed test with fileno (thanks to Karl Wette). + * Allow state of btparse parser to be reset, for parsing multiple files (Karl Wette): + - bt_parse_entry(): reset parser state if infile == NULL + - BibTeX.xs: add _reset_parse(), _reset_parse_s() methods to Text::BibTeX::Entry + - Text::BibTeX::Entry: allow new() or parse() with undefined filehandle; calls _reset_parse() + - Text::BibTeX::Entry: allow new() or parse_s() with undefined text; calls _reset_parse_s() + - Text::BibTeX::File: close() calls Text::BibTeX::Entry->new($filename, undef) to reset parser + + 0.77 2016-09-20 + * Fixes for testing and installing on Darwin (install_name issues). + Thanks to Nuno "smash" Carvalho for the report and debug help. + + 0.76 2016-07-06 + * Added 'reset_macros' option to Text::BibTeX::File, in order + to remove all defined macros (except months) + + 0.76_02 2016-07-05 + * Fix issue with binmode not being copied in Clone method. + * Make month abbreviations available always, and not only when + using Text::BibTeX::Bib. + * Added docs to supported options for Text::BibTeX::Entry. + + 0.76_01 2016-07-04 + * Solved nasty bug when using lvalues as parameters (substr). + * Added tests. + + 0.75 2016-07-03 + * Stable version with bytes/utf-8 support. + + 0.75_05 2016-07-02 + * Get 5.8.x back aboard; + + 0.75_04 2016-07-01 + * Fixed reference to empty function name; + + 0.75_03 2016-06-30 + * Rename split_list to isplit_list, and creaed split_list wrapper; + * Added normalization option; + + 0.75_02 2016-06-25 + * Minor fix for some perl version parsing problems. + + 0.75_01 2016-06-24 + * Added binmode option. Should allow unicode handling directly. + + 0.74 2016-06-15 + * Get perl 5.8.x back. + + 0.73 2016-06-14 + * Change some documentation in order to use ->new method, instead + of older 'new Class()' approach; + * Add sensible default values to Text::BibTeX::NameFormat to reduce + the amount of segmentation faults for users forgetting arguments. + +------------------------------------------------------------------- Old: ---- Text-BibTeX-0.72.tar.gz Text-BibTeX-rpmlint.patch perl-Text-BibTeX-uninit.patch New: ---- Text-BibTeX-0.80.tar.gz cpanspec.yml manual-pages-for-libbtparse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-BibTeX.spec ++++++ --- /var/tmp/diff_new_pack.yAn5te/_old 2017-06-25 19:20:41.532492188 +0200 +++ /var/tmp/diff_new_pack.yAn5te/_new 2017-06-25 19:20:41.536491622 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Text-BibTeX # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,19 @@ # -%define cpan_name Text-BibTeX Name: perl-Text-BibTeX -Version: 0.72 +Version: 0.80 Release: 0 -Summary: Interface to read and parse BibTeX files +%define cpan_name Text-BibTeX +Summary: Interface to Read and Parse BibTeX Files License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Text-BibTeX/ -Source0: http://www.cpan.org/authors/id/A/AM/AMBS/%{cpan_name}-%{version}.tar.gz -Patch0: Text-BibTeX-rpmlint.patch -Patch2: perl-Text-BibTeX-uninit.patch +Source0: https://cpan.metacpan.org/authors/id/A/AM/AMBS/%{cpan_name}-%{version}.tar.… +Source1: cpanspec.yml +Patch0: manual-pages-for-libbtparse.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: glibc-devel BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Capture::Tiny) >= 0.06 @@ -36,7 +38,6 @@ BuildRequires: perl(Module::Build) >= 0.360300 BuildRequires: perl(Scalar::Util) >= 1.42 Requires: perl(Scalar::Util) >= 1.42 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} %description @@ -54,23 +55,31 @@ object-oriented class hierarchy centred around the 'Text::BibTeX::Entry' class, mainly because they are specific to bibliographic data and operate on generic strings (rather than being tied to a particular BibTeX entry). -These are also documented here, in the "MISCELLANEOUS FUNCTIONS" manpage. +These are also documented here, in "MISCELLANEOUS FUNCTIONS". Note that every module described here begins with the 'Text::BibTeX' prefix. For brevity, I have dropped this prefix from most class and module names in the rest of this manual page (and in most of the other manual pages in the library). +%package devel +Summary: C library for parsing and processing BibTeX files +Group: Development/Libraries/Other +Provides: %{name}:%{_libdir}/libbtparse.so + +%description devel +The libbtparse is a C library for parsing and processing BibTeX files. +Note that the interface provided by libbtparse, while complete, is fairly +low-level. If you have more sophisticated needs, you might be interested +the "Text::BibTeX" module for Perl. + %prep %setup -q -n %{cpan_name}-%{version} -%patch0 -%patch2 -p1 +%patch0 -p1 find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %build -export CFLAGS='%{optflags}' -export CC=gcc -perl Build.PL installdirs=vendor optimize="%{optflags}" +%{__perl} Build.PL installdirs=vendor optimize="%{optflags}" ./Build build flags=%{?_smp_mflags} %check @@ -78,11 +87,21 @@ %install ./Build install destdir=%{buildroot} create_packlist=0 +chmod -R u+rw %{buildroot} %perl_gen_filelist +%post devel -p /sbin/ldconfig + +%postun devel -p /sbin/ldconfig + %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes README README.OLD scripts THANKS +%doc Changes examples README README.OLD scripts THANKS +%exclude %{_mandir}/man3/*.3.gz + +%files devel +%defattr(-,root,root,755) %{_libdir}/libbtparse.so +%{_mandir}/man3/*.3.gz %changelog ++++++ Text-BibTeX-0.72.tar.gz -> Text-BibTeX-0.80.tar.gz ++++++ ++++ 5887 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module ++++++ manual-pages-for-libbtparse.patch ++++++ --- Text-BibTeX-0.80/inc/MyBuilder.pm 2017-03-25 20:41:12.000000000 +0000 +++ Text-BibTeX-0.80/inc/MyBuilder.pm 2017-05-31 09:58:18.898289185 +0000 @@ -162,8 +162,8 @@ sub ACTION_create_manpages { my $version = $self->notes('btparse_version'); for my $pod (@$pods) { my $man = $pod; - $man =~ s!.pod!.1!; - $man =~ s!btparse/doc!blib/bindoc!; ## FIXME - path + $man =~ s!.pod!.3!; + $man =~ s!btparse/doc!blib/libdoc!; next if $self->up_to_date($pod, $man); ## FIXME `pod2man --section=1 --center="btparse" --release="btparse, version $version" $pod $man`;

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2017-06-24 08:34:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Sat Jun 24 08:34:48 2017 rev:159 rq:505970 version:59.0.3071.109 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2017-06-17 10:23:41.445814188 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2017-06-24 08:35:15.669543395 +0200 @@ -1,0 +2,12 @@ +Fri Jun 23 07:46:48 UTC 2017 - astieger(a)suse.com + +- Update to 59.0.3071.109: + * ozone/drm: Only reuse ScanoutBuffers with compatible modifiers + * Fixing mouse focus on WebView + * Remove gtk dependency from gles tests + * Set build flag when using own FreeType + * Revert of [scheduler] Move some task types to suspendable task runner + * Fix an incorrect method name on the chrome://site-engagement WebUI page + * Linux/Windows: Removing Guest menu item for supervised profile + +------------------------------------------------------------------- Old: ---- chromium-59.0.3071.104.tar.xz New: ---- chromium-59.0.3071.109.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.YNUOPa/_old 2017-06-24 08:35:30.967380261 +0200 +++ /var/tmp/diff_new_pack.YNUOPa/_new 2017-06-24 08:35:30.971379697 +0200 @@ -35,7 +35,7 @@ %endif %bcond_with clang Name: chromium -Version: 59.0.3071.104 +Version: 59.0.3071.109 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause and LGPL-2.1+ ++++++ chromium-59.0.3071.104.tar.xz -> chromium-59.0.3071.109.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-59.0.3071.104.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-59.0.3071.109.tar.xz differ: char 26, line 1

1 0

commit tomcat for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2017-06-24 08:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat" Sat Jun 24 08:34:44 2017 rev:38 rq:505919 version:8.0.44 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2017-05-22 10:48:48.637690801 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2017-06-24 08:34:59.931768737 +0200 @@ -1,0 +2,8 @@ +Fri Jun 9 05:44:53 UTC 2017 - ecsos(a)opensuse.org + +- Version update to 8.0.44: + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html + * Fixed CVE: + - CVE-2017-5664 (bsc#1042910) + +------------------------------------------------------------------- Old: ---- apache-tomcat-8.0.43-src.tar.gz apache-tomcat-8.0.43-src.tar.gz.asc New: ---- apache-tomcat-8.0.44-src.tar.gz apache-tomcat-8.0.44-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.MhO37N/_old 2017-06-24 08:35:00.711658459 +0200 +++ /var/tmp/diff_new_pack.MhO37N/_new 2017-06-24 08:35:00.711658459 +0200 @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 8 %define minor_version 0 -%define micro_version 43 +%define micro_version 44 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} ++++++ apache-tomcat-8.0.43-src.tar.gz -> apache-tomcat-8.0.44-src.tar.gz ++++++ ++++ 2025 lines of diff (skipped)

1 0

commit python-CommonMark for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package python-CommonMark for openSUSE:Factory checked in at 2017-06-24 08:34:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-CommonMark (Old) and /work/SRC/openSUSE:Factory/.python-CommonMark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-CommonMark" Sat Jun 24 08:34:46 2017 rev:3 rq:505951 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-CommonMark/python-CommonMark.changes 2017-05-06 18:31:14.661741282 +0200 +++ /work/SRC/openSUSE:Factory/.python-CommonMark.new/python-CommonMark.changes 2017-06-24 08:35:02.267438470 +0200 @@ -1,0 +2,11 @@ +Wed Jun 21 22:11:08 UTC 2017 - dimstar(a)opensuse.org + +- Fix typo in Requires (pyython3 -> python3). + +------------------------------------------------------------------- +Fri Jun 9 13:22:57 UTC 2017 - jengelh(a)inai.de + +- A roadmap does not belong into the description. +- Resolve typographicly wrong apostrophe. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-CommonMark.spec ++++++ --- /var/tmp/diff_new_pack.90kQbQ/_old 2017-06-24 08:35:02.739371738 +0200 +++ /var/tmp/diff_new_pack.90kQbQ/_new 2017-06-24 08:35:02.743371172 +0200 @@ -26,11 +26,11 @@ Group: Development/Languages/Python Url: https://pypi.python.org/pypi/CommonMark Source: https://files.pythonhosted.org/packages/source/C/CommonMark/CommonMark-%{ve… -BuildRequires: fdupes -BuildRequires: python-rpm-macros -BuildRequires: %{python_module future} BuildRequires: %{python_module devel} +BuildRequires: %{python_module future} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-future BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -46,41 +46,27 @@ %python_subpackages %description -Pure Python port of jgm’s stmd.js, a Markdown parser and renderer for the -CommonMark specification, using only native modules. Once both this project and -the CommonMark specification are stable we will release the first 1.0 version -and attempt to keep up to date with changes in stmd.js. - -We are currently at the same development stage (actually a bit ahead because we -have implemented HTML entity conversion and href URL escaping) as stmd.js. Since -Python versions pre-3.4 use outdated (i.e. not HTML5 spec) entity conversion, -I’ve converted the 3.4 implementation into a single file, entitytrans.py which -so far seems to work (all tests pass on 2.7, 3.3, and 3.4). +Pure Python port of jgm's stmd.js, a Markdown parser and renderer for the +CommonMark specification, using only native modules. %package -n %{name}-doc Summary: Documentation for CommonMark +Group: Documentation/HTML Provides: %{python_module CommonMark-doc = %{version}} %description -n %{name}-doc -Documentation for Pure Python port of jgm’s stmd.js, a Markdown parser and +Documentation for Pure Python port of jgm's stmd.js, a Markdown parser and renderer for the CommonMark specification, using only native modules. %package -n cmark-python Summary: CommonMark parsing and rendering program in python -Requires: pyython3-CommonMark = %{version} +Group: Development/Languages/Python +Requires: python3-CommonMark = %{version} Conflicts: cmark %description -n cmark-python -Pure Python port of jgm’s stmd.js, a Markdown parser and renderer for the -CommonMark specification, using only native modules. Once both this project and -the CommonMark specification are stable we will release the first 1.0 version -and attempt to keep up to date with changes in stmd.js. - -We are currently at the same development stage (actually a bit ahead because we -have implemented HTML entity conversion and href URL escaping) as stmd.js. Since -Python versions pre-3.4 use outdated (i.e. not HTML5 spec) entity conversion, -I’ve converted the 3.4 implementation into a single file, entitytrans.py which -so far seems to work (all tests pass on 2.7, 3.3, and 3.4). +Pure Python port of jgm's stmd.js, a Markdown parser and renderer for the +CommonMark specification, using only native modules. This package provides the "cmark" executable, to avoid conflicts with other implementations. @@ -101,14 +87,12 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} - # Test broken due to encoding issue # %check # export LANG=en_US.UTF-8 # export PYTHONPATH=%{buildroot}%{python_sitelib} # python setup.py test - %files %{python_files} %defattr(-,root,root,-) %doc README.rst LICENSE

1 0

commit fate for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package fate for openSUSE:Factory checked in at 2017-06-24 08:34:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fate (Old) and /work/SRC/openSUSE:Factory/.fate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fate" Sat Jun 24 08:34:43 2017 rev:7 rq:505866 version:1.6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fate/fate.changes 2017-06-09 15:57:32.894476419 +0200 +++ /work/SRC/openSUSE:Factory/.fate.new/fate.changes 2017-06-24 08:34:58.731938395 +0200 @@ -1,0 +2,6 @@ +Fri Jun 23 11:03:19 UTC 2017 - jplack(a)suse.com + +- bugfix release 1.6.0.1 + * bsc#1044954 FATE crashes on selected feature in query (TumbleWeed only) + +------------------------------------------------------------------- Old: ---- fate-20170608-ebd3ef1b.tar.bz2 New: ---- fate-20170623-c1270a95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fate.spec ++++++ --- /var/tmp/diff_new_pack.QXazOn/_old 2017-06-24 08:34:59.235867138 +0200 +++ /var/tmp/diff_new_pack.QXazOn/_new 2017-06-24 08:34:59.239866572 +0200 @@ -17,8 +17,8 @@ %define baseversion 1.6 -%define patchlevel .0 -%define snapshot 20170608-ebd3ef1b +%define patchlevel .0.1 +%define snapshot 20170623-c1270a95 Name: fate Version: %{baseversion}%{patchlevel} Release: 0 ++++++ fate-20170608-ebd3ef1b.tar.bz2 -> fate-20170623-c1270a95.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditor.cpp new/fate-20170623-c1270a95/src/fate/editor/actoreditor.cpp --- old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditor.cpp 2017-06-08 14:56:14.815453970 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/actoreditor.cpp 2017-06-23 13:02:00.417130362 +0200 @@ -189,21 +189,18 @@ } void -ActorEditor::setRoleAndPerson(const QString &userid, const QString& email, const QString &fullname, const QString& role) +ActorEditor::setActor(const FeatureData::Actor &actor) { - editUsername->setText(userid); - editEmail->setText(email); - editFullname->setText(fullname); - slotEmailChanged(email); - cmbRole->setCurrentRole(role); + if (actor.isPersonValid()) + buttonGroup2->setTitle(tr2i18n("Edit Actor", 0)); - slotEnableOkButton(); -} + editUsername->setText(actor.userid); + editEmail->setText(actor.email); + editFullname->setText(actor.fullName); + slotEmailChanged(actor.email); + cmbRole->setCurrentRole(actor.roleId); -void -ActorEditor::setActor(const FeatureData::Actor &actor) -{ - setRoleAndPerson(actor.userid, actor.email, actor.fullName, actor.roleId); + slotEnableOkButton(); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditor.h new/fate-20170623-c1270a95/src/fate/editor/actoreditor.h --- old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditor.h 2017-06-08 14:56:14.815453970 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/actoreditor.h 2017-06-23 13:02:00.417130362 +0200 @@ -45,7 +45,6 @@ QString email() const; QString username() const; QString fullname() const; - void setRoleAndPerson(const QString &userid, const QString &email, const QString &fullname, const QString &role); void clear(); bool isValidEmail(const QString& mail); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditordialogbase.ui new/fate-20170623-c1270a95/src/fate/editor/actoreditordialogbase.ui --- old/fate-20170608-ebd3ef1b/src/fate/editor/actoreditordialogbase.ui 2017-06-08 14:56:14.815453970 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/actoreditordialogbase.ui 2017-06-23 13:02:00.417130362 +0200 @@ -17,7 +17,7 @@ <item row="0" column="0"> <widget class="QGroupBox" name="buttonGroup2"> <property name="title"> - <string>Edit Actor</string> + <string>Add Actor</string> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/actorlistedit.cpp new/fate-20170623-c1270a95/src/fate/editor/actorlistedit.cpp --- old/fate-20170608-ebd3ef1b/src/fate/editor/actorlistedit.cpp 2017-06-08 14:56:14.815453970 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/actorlistedit.cpp 2017-06-23 13:02:00.417130362 +0200 @@ -231,7 +231,7 @@ FeatureData::Actor::List *actors = actorItem->actors(); FeatureData::Actor &actor = actors->first(); // here edit always the first in the list - dlg.setRoleAndPerson(actor.userid, actor.email, actor.fullName, actor.roleId); + dlg.setActor(actor); if (dlg.exec() != QDialog::Accepted) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/featureview.cpp new/fate-20170623-c1270a95/src/fate/editor/featureview.cpp --- old/fate-20170608-ebd3ef1b/src/fate/editor/featureview.cpp 2017-06-08 14:56:14.819453990 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/featureview.cpp 2017-06-23 13:02:00.417130362 +0200 @@ -516,17 +516,6 @@ } } -// TODO: this should go completely to MainView -void FeatureView::importFeature( Feature *feature ) -{ - if (!mSimpleEditor) - return; - - setFeature(feature); - mFeatureMap->addFeature(feature); - focusEditor(); -} - void FeatureView::slotCommentRequest( int inReplyTo ) { if( mCommentDialog ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/editor/featureview.h new/fate-20170623-c1270a95/src/fate/editor/featureview.h --- old/fate-20170608-ebd3ef1b/src/fate/editor/featureview.h 2017-06-08 14:56:14.819453990 +0200 +++ new/fate-20170623-c1270a95/src/fate/editor/featureview.h 2017-06-23 13:02:00.417130362 +0200 @@ -64,6 +64,7 @@ bool isCommentInProgress() const { return mCommentDialog; } Feature* currentFeature(); void setReadOnly( bool readOnly ); + void focusEditor(); protected: bool switchToTab(QWidget *); @@ -82,7 +83,6 @@ void editProductList(); void startECO(); void cancelECO(); - void importFeature( Feature * ); void printFeature(); void saveCurrentFeature(); void saveAllFeatures(); @@ -92,13 +92,11 @@ // display part to actively select a feature: // it shows only _one_ feature! void featureSelected( Feature * ); - void featureModified( Feature * ); void featureTitleChanged( Feature *, const QString & ); void showTreeRequest( const QString & ); protected: void saveComments(); - void focusEditor(); QWidget *featureDisplay(QWidget *parent); QWidget *commentsView(QWidget *parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/mainview.cpp new/fate-20170623-c1270a95/src/fate/mainview.cpp --- old/fate-20170608-ebd3ef1b/src/fate/mainview.cpp 2017-06-08 14:56:14.819453990 +0200 +++ new/fate-20170623-c1270a95/src/fate/mainview.cpp 2017-06-23 13:02:00.421130381 +0200 @@ -201,7 +201,9 @@ mFeatureListView, SLOT( updateFeature( Feature * ) ) ); connect( &mFeatureMap, SIGNAL( dataChanged() ), SLOT( slotFeatureDataChanged() ) ); - connect( &mFeatureMap, SIGNAL( featureReloaded( Feature * ) ), + + // Thinks we do not need that in the end ... + connect( &mFeatureMap, SIGNAL( featureChanged( Feature * ) ), SLOT( slotFeatureReloaded( Feature * ) ) ); connect( &mFeatureMap, SIGNAL( connectionEstablished( bool ) ), SIGNAL( connectionEstablished( bool ) ) ); @@ -209,13 +211,6 @@ // way to change the displayed feature for it connect( &mFeatureMap, SIGNAL( currentFeatureChanged( Feature * ) ), mFeatureView, SLOT( setFeature( Feature * ) ) ); - // TODO: clarify: can this ever happen? what does that signal mean? - connect( &mFeatureMap, SIGNAL( currentFeatureRemoved() ), - mFeatureView, SLOT( clear() ) ); - - connect( mFeatureView, SIGNAL( featureModified( Feature * ) ), - mFeatureListView, SLOT( updateFeature( Feature * ) ) ); - connect( mFeatureListView, SIGNAL( featureSelected( Feature * ) ), SLOT( showFeature( Feature * ) ) ); /* @@ -439,7 +434,7 @@ StartupSequence::self()->setPrecondition( StartupSequence::StartupQueryDone, true ); - } else if( mFeatureMap.hasModifiedFeatures() ) { + } else if( mFeatureMap.hasCachedModifiedFeatures() ) { mFeatureMap.loadModifiedFeatures(); StartupSequence::self()->setPrecondition( StartupSequence::StartupQueryDone, true ); @@ -1057,8 +1052,11 @@ if( dlg->exec() == QDialog::Accepted ) { Feature *f = dlg->feature(); f->setModified(true); - mFeatureView->importFeature( f ); - mFeatureListView->selectFeature( f ); + + mFeatureMap.addFeature(f); + mFeatureMap.setCurrentFeature(f); + mFeatureView->setFeature(f); + mFeatureView->focusEditor(); } } @@ -1074,7 +1072,7 @@ FeatureParser parser; connect( &parser, SIGNAL(featureParsed( Feature * )), - mFeatureView, SLOT(importFeature( Feature * )) ); + &mFeatureMap, SLOT(addFeature( Feature * )) ); clonedFeature = new Feature; clonedFeature->setModified(true); @@ -1152,7 +1150,7 @@ FeatureParser parser; connect( &parser, SIGNAL(featureParsed( Feature * )), - mFeatureView, SLOT(importFeature( Feature * )) ); + mFeatureView, SLOT(addFeature( Feature * )) ); KResult result = parser.parse( xml ); if ( !result ) KMessageBox::sorry( this, result.fullMessage() ); @@ -1162,8 +1160,8 @@ { ImportBugzillaDialog dlg( ProductMap::self(), this ); - connect( &dlg, SIGNAL( featureParsed( Feature * ) ), mFeatureView, - SLOT( importFeature( Feature * ) ) ); + connect( &dlg, SIGNAL( featureParsed( Feature * ) ), + &mFeatureMap, SLOT( addFeature( Feature * ) ) ); dlg.exec(); } @@ -1199,7 +1197,6 @@ void MainView::slotFeatureReloaded( Feature * f ) { - f->setModified( false ); Feature *currentFeature = mFeatureView->currentFeature(); if ( !currentFeature || currentFeature->id() == f->id() ) { showFeature( f ); @@ -1888,7 +1885,8 @@ } if ( !f ) { - f = mFeatureMap.firstFeature(); + // return the first or NULL if empty + f = mFeatureMap.features().value(0, NULL); if ( f ) kDebug() << k_funcinfo << "Showing first feature: " << f->id(); else kDebug() << k_funcinfo << "Unable to find first feature."; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/qxtcheckcombobox.cpp new/fate-20170623-c1270a95/src/fate/qxtcheckcombobox.cpp --- old/fate-20170608-ebd3ef1b/src/fate/qxtcheckcombobox.cpp 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/qxtcheckcombobox.cpp 2017-06-23 13:02:00.421130381 +0200 @@ -54,6 +54,7 @@ if (keyEvent->key() != Qt::Key_Escape) return true; } + break; } case QEvent::MouseButtonPress: containerMousePress = (receiver == qxt_p().view()->window()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/relationtreeitem.cpp new/fate-20170623-c1270a95/src/fate/relationtreeitem.cpp --- old/fate-20170608-ebd3ef1b/src/fate/relationtreeitem.cpp 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/relationtreeitem.cpp 2017-06-23 13:02:00.421130381 +0200 @@ -25,23 +25,18 @@ #include <kiconloader.h> #include <kdebug.h> -SharedRelation::SharedRelation(const Relation &r, Feature *f, bool isDummy) +SharedTreeRelation::SharedTreeRelation(const Relation &r, Feature *f, bool isDummy) : Relation(r), mFeature(f), mDummyFeature(f == 0 || isDummy) { } -SharedRelation::SharedRelation(Feature *f, bool isDummy) -: mFeature(f), mDummyFeature(f == 0 || isDummy) -{ -} - -SharedRelation::~SharedRelation() +SharedTreeRelation::~SharedTreeRelation() { updateFeature(0); } void -SharedRelation::updateFeature(Feature *f) +SharedTreeRelation::updateFeature(Feature *f) { if (mDummyFeature && mFeature) delete mFeature; @@ -50,7 +45,7 @@ } QString -SharedRelation::property(Property id) const +SharedTreeRelation::property(Property id) const { switch (id) { case FeatureId: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/relationtreeitem.h new/fate-20170623-c1270a95/src/fate/relationtreeitem.h --- old/fate-20170608-ebd3ef1b/src/fate/relationtreeitem.h 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/relationtreeitem.h 2017-06-23 13:02:00.421130381 +0200 @@ -33,18 +33,17 @@ // The relation can hold a pointer to the feature it is attached // to. ////////////////////////////////////////////////////////////////// -class SharedRelation : public Relation, public QSharedData { +class SharedTreeRelation : public Relation, public QSharedData { public: enum Property { FeatureId, FeatureTitle, }; - typedef QExplicitlySharedDataPointer<SharedRelation> Pointer; + typedef QExplicitlySharedDataPointer<SharedTreeRelation> Pointer; - SharedRelation(const Relation &, Feature *f = 0, bool isDummy = false); - SharedRelation(Feature *f = 0, bool isDummy = false); - ~SharedRelation(); + SharedTreeRelation(const Relation &, Feature *f = 0, bool isDummy = false); + ~SharedTreeRelation(); Feature *feature() { return mFeature; @@ -61,6 +60,6 @@ bool mDummyFeature; }; -Q_DECLARE_METATYPE(SharedRelation::Pointer); +Q_DECLARE_METATYPE(SharedTreeRelation::Pointer); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/relationtreeview.cpp new/fate-20170623-c1270a95/src/fate/relationtreeview.cpp --- old/fate-20170608-ebd3ef1b/src/fate/relationtreeview.cpp 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/relationtreeview.cpp 2017-06-23 13:02:00.421130381 +0200 @@ -255,7 +255,7 @@ void RelationTreeView::slotItemClicked(QTreeWidgetItem *item) { - SharedRelation *relation; + SharedTreeRelation *relation; if (!item || !(relation = nodeRelation(item))) return; @@ -341,21 +341,21 @@ } void -RelationTreeView::setNodeRelation(QTreeWidgetItem *item, SharedRelation *relation) +RelationTreeView::setNodeRelation(QTreeWidgetItem *item, SharedTreeRelation *relation) { QVariant data; - data.setValue(SharedRelation::Pointer(relation)); + data.setValue(SharedTreeRelation::Pointer(relation)); item->setData(0, Qt::UserRole, data); } -SharedRelation * +SharedTreeRelation * RelationTreeView::nodeRelation(QTreeWidgetItem *item) { QVariant data = item->data(0, Qt::UserRole); - SharedRelation *relation; + SharedTreeRelation *relation; - SharedRelation::Pointer ex(data.value<SharedRelation::Pointer>()); + SharedTreeRelation::Pointer ex(data.value<SharedTreeRelation::Pointer>()); if ((relation = ex.data()) == 0) { // This tree node was created as the result of a drop operation Relation r; @@ -363,7 +363,7 @@ r.setTarget(item->text(0)); r.setDescription(item->text(1)); - relation = createSharedRelation(r, item->parent()); + relation = createSharedTreeRelation(r, item->parent()); setNodeRelation(item, relation); } @@ -371,7 +371,7 @@ } QTreeWidgetItem * -RelationTreeView::addNode(QTreeWidgetItem *parent, SharedRelation *relation) +RelationTreeView::addNode(QTreeWidgetItem *parent, SharedTreeRelation *relation) { QTreeWidgetItem *item; @@ -383,18 +383,18 @@ setNodeRelation(item, relation); - item->setText(0, relation->property(SharedRelation::FeatureId)); - item->setText(1, relation->property(SharedRelation::FeatureTitle)); + item->setText(0, relation->property(SharedTreeRelation::FeatureId)); + item->setText(1, relation->property(SharedTreeRelation::FeatureTitle)); item->setExpanded(true); return item; } -SharedRelation * -RelationTreeView::createSharedRelation(const Relation &relation, bool isChild) +SharedTreeRelation * +RelationTreeView::createSharedTreeRelation(const Relation &relation, bool isChild) { - SharedRelation *sharedRelation; + SharedTreeRelation *sharedRelation; Feature *f = 0; bool dummy = false; @@ -406,11 +406,11 @@ f->setId(relation.target()); f->setTitle(i18n("Feature not loaded")); - // make sure feature is destroyed when SharedRelation goes away + // make sure feature is destroyed when SharedTreeRelation goes away dummy = true; } - sharedRelation = new SharedRelation(relation, f, dummy); + sharedRelation = new SharedTreeRelation(relation, f, dummy); if (isChild) sharedRelation->setType("feature/parent"); @@ -422,7 +422,7 @@ { QTreeWidgetItem *item; - item = addNode(parent, createSharedRelation(node.relation, parent != 0)); + item = addNode(parent, createSharedTreeRelation(node.relation, parent != 0)); RelationTree::Node::List::const_iterator it; for (it = node.children.begin(); it != node.children.end(); ++it) @@ -514,7 +514,7 @@ for (int i = 0; i < mListView->topLevelItemCount(); ++i) { QTreeWidgetItem *item = mListView->topLevelItem(i); - SharedRelation *relation = nodeRelation(item); + SharedTreeRelation *relation = nodeRelation(item); map[relation->target()] = synchNode(item, "feature", sortPosition++); } @@ -525,7 +525,7 @@ RelationTree::Node RelationTreeView::synchNode(QTreeWidgetItem *item, const char *type, int sortPosition) { - SharedRelation *relation = nodeRelation(item); + SharedTreeRelation *relation = nodeRelation(item); RelationTree::Node node; int childPosition = 1; @@ -571,7 +571,7 @@ isRelated = true; } - SharedRelation *relation = nodeRelation(item); + SharedTreeRelation *relation = nodeRelation(item); if (!relation->isDummyFeature()) { Feature *f = relation->feature(); @@ -622,7 +622,7 @@ void RelationTreeView::stockNode(QTreeWidgetItem *item, QStringList &missingFeatures) { - SharedRelation *relation = nodeRelation(item); + SharedTreeRelation *relation = nodeRelation(item); if (relation->feature() == 0 || relation->isDummyFeature()) { Feature *f = mFeatureMap->feature(relation->target()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/relationtreeview.h new/fate-20170623-c1270a95/src/fate/relationtreeview.h --- old/fate-20170608-ebd3ef1b/src/fate/relationtreeview.h 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/relationtreeview.h 2017-06-23 13:02:00.421130381 +0200 @@ -38,7 +38,7 @@ class QLabel; class FeatureMap; class ProductMap; -class SharedRelation; +class SharedTreeRelation; class FateComboBox; class QComboBox; @@ -101,11 +101,11 @@ void slotProductChosen(const QString &); protected: - void setNodeRelation(QTreeWidgetItem *item, SharedRelation *relation); - SharedRelation *createSharedRelation(const Relation &relation, bool isChild); - SharedRelation *nodeRelation(QTreeWidgetItem *item); + void setNodeRelation(QTreeWidgetItem *item, SharedTreeRelation *relation); + SharedTreeRelation *createSharedTreeRelation(const Relation &relation, bool isChild); + SharedTreeRelation *nodeRelation(QTreeWidgetItem *item); void buildNode(QTreeWidgetItem *parent, const RelationTree::Node &node); - QTreeWidgetItem *addNode(QTreeWidgetItem *parent, SharedRelation *relation); + QTreeWidgetItem *addNode(QTreeWidgetItem *parent, SharedTreeRelation *relation); RelationTree::Node synchNode(QTreeWidgetItem *item, const char *, int sortPosition); void stockNode(QTreeWidgetItem *item, QStringList &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/fate/renderer/xsltrenderer.cpp new/fate-20170623-c1270a95/src/fate/renderer/xsltrenderer.cpp --- old/fate-20170608-ebd3ef1b/src/fate/renderer/xsltrenderer.cpp 2017-06-08 14:56:14.823454009 +0200 +++ new/fate-20170623-c1270a95/src/fate/renderer/xsltrenderer.cpp 2017-06-23 13:02:00.421130381 +0200 @@ -152,7 +152,7 @@ // replaces the template %id in the display string with the feature id, // which is used for example in the attachment path so far. const char* param[251]; - memset( param, 0, 251 ); + memset( param, 0, 251 * sizeof(char)); RelationType::List relationTypes = RelationType::allRelationTypes(); RelationType::List::ConstIterator it; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/libfate/config/fate.kcfg new/fate-20170623-c1270a95/src/libfate/config/fate.kcfg --- old/fate-20170608-ebd3ef1b/src/libfate/config/fate.kcfg 2017-06-08 14:56:14.827454029 +0200 +++ new/fate-20170623-c1270a95/src/libfate/config/fate.kcfg 2017-06-23 13:02:00.425130400 +0200 @@ -245,7 +245,7 @@ <group name="Bugzilla"> <entry name="BugzillaBugUrl" type="String"> <label>Url for querying a bug by id</label> - <default>https://apibugzilla.novell.com/show_bug.cgi?id=%1&ctype=xml</default> + <default>https://apibugzilla.suse.com/show_bug.cgi?id=%1&ctype=xml</default> </entry> </group> </kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/libfate/featuremap.cpp new/fate-20170623-c1270a95/src/libfate/featuremap.cpp --- old/fate-20170608-ebd3ef1b/src/libfate/featuremap.cpp 2017-06-08 14:56:14.827454029 +0200 +++ new/fate-20170623-c1270a95/src/libfate/featuremap.cpp 2017-06-23 13:02:00.425130400 +0200 @@ -1,9 +1,10 @@ /* This file is part of Fate. - Copyright (c) 2005-2007 SUSE LINUX Products GmbH + Copyright (c) 2005-2007, 2014 SUSE LINUX Products GmbH Author: Cornelius Schumacher <cschum(a)suse.de> + Joachim Plack <jplack(a)suse.de> 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 @@ -43,13 +44,13 @@ #include <assert.h> +static const QString container = "feature"; + FeatureMap::FeatureMap() - : mFirstFeature( 0 ), mCurrentFeature( 0 ), mQueryRunning( false ), + : mCurrentFeature( 0 ), mQueryRunning( false ), mView( 0 ), mLoadCount( 0 ), mCache( 0 ), mChangeSet( 0 ), mSynch( true ), mRestockSilent( false ) { - QString container = "feature"; - if ( Prefs::self()->cachedQuery() ) { initCache(); } @@ -97,8 +98,16 @@ FeatureMap::~FeatureMap() { clear(); - clearFeatureList(); - clearPersistantFeatures(); + mFeatures.clear(); + // clear persistant features(); + QList<Feature *>::Iterator it; + QList<Feature *> list = mIdMap.values(); + + for( it = list.begin(); it != list.end(); ++it ) { + mRevisionMap.remove( (*it)->id() ); + delete *it; + } + mIdMap.clear(); delete mSaveEngine; delete mQueryEngine; @@ -128,8 +137,6 @@ void FeatureMap::initCache() { - QString container = "feature"; - if( mCache ) { delete mCache; } @@ -187,11 +194,10 @@ finishQuery(); } -bool FeatureMap::hasModifiedFeatures() +bool FeatureMap::hasCachedModifiedFeatures() const { if( mCache ) { - return ( mCache->hasModifiedItems() || - mCache->hasNewItems() ); + return ( mCache->hasModifiedItems() || mCache->hasNewItems() ); } return false; @@ -200,45 +206,39 @@ void FeatureMap::clear() { mKeptFeatures.clear(); - mFirstFeature = 0; mCurrentFeature = 0; mLoadCount = 0; mCachedIds.clear(); mIds.clear(); mSynch = true; - mModifiedFeatures.clear(); - emit currentFeatureRemoved(); - emit featuresModified( false ); + emit currentFeatureChanged(0); + emit featuresModified(); } -void FeatureMap::clearFeatureList() +void FeatureMap::setCurrentFeature( Feature *f ) { - mFeatures.clear(); + if (mCurrentFeature == f) + return; + mCurrentFeature = f; + emit currentFeatureChanged( f ); } -void FeatureMap::clearPersistantFeatures() +Feature * FeatureMap::currentFeature() const { - QList<Feature *>::Iterator it; - QList<Feature *> list = mIdMap.values(); - - for( it = list.begin(); it != list.end(); ++it ) { - mRevisionMap.remove( (*it)->id() ); - delete *it; - } - mIdMap.clear(); - mFirstFeature = 0; + return mCurrentFeature; } -void FeatureMap::setCurrentFeature( Feature *f ) +const Feature::List & FeatureMap::features() const { - mCurrentFeature = f; + return mFeatures; } void FeatureMap::addFeatures(QList<Feature *> features) { - for (int i = 0; i < features.size(); ++i) - addFeature(features[i]); + foreach( Feature *feature, features ) { + addFeature(feature); + } } void FeatureMap::memberFeatureChanged() @@ -272,16 +272,11 @@ mRevisionMap[f->id()] = QString::number( f->revision() ); } - if ( !mFirstFeature ) mFirstFeature = f; - if ( mCache && !f->id().isEmpty() ) { if ( !mCache->hasRevision( f->id(), QString::number( f->revision() ) ) ) { mCache->save( f->id(), QString::number( f->revision() ), f ); } } - if( f->isModified() ) { - mModifiedFeatures.append( f ); - } emit featureAdded( f ); } @@ -292,37 +287,36 @@ return; if( mCurrentFeature == f ) { - emit currentFeatureRemoved(); + setCurrentFeature( 0 ); } mRevisionMap.remove( f->id() ); mIdMap.remove( f->id() ); - if( f->isModified() ) { - mModifiedFeatures.removeAll(f); - } if( mCache ) { mCache->removeModifiedItem( f->id() ); } mFeatures.removeAll(f); delete f; - if( mModifiedFeatures.isEmpty() ) { + if( hasNoModifiedFeatures() ) { mSynch = true; } - if( mFeatures.size() == 0 ) - mFirstFeature = 0; + // Would be better to emit featureRemoved(f) + emit featuresModified(); } -Feature * -FeatureMap::feature(const QString &id) +void FeatureMap::signalFeatureModification( Feature *f ) { - QMap<QString,Feature *>::ConstIterator it; + if (!f) f = mCurrentFeature; + f->setModified(true); + emit featureChanged( f ); +} - it = mIdMap.find(id); - if (it == mIdMap.end()) - return 0; - return it.value(); +Feature * +FeatureMap::feature(const QString &id) const +{ + return mIdMap.value( id, NULL ); } Feature::List @@ -330,46 +324,55 @@ { Feature::List features; - Feature::List::ConstIterator it; - for ( it = mFeatures.begin(); it != mFeatures.end(); ++it ) { - if ( (*it)->isModified() ) features.append( *it ); + foreach( Feature *f, mFeatures ) { + if ( f->isModified() ) features.append( f ); } return features; } + +bool FeatureMap::hasNoModifiedFeatures() const +{ + foreach( Feature *f, mFeatures ) { + if ( f->isModified() ) + return false; + } + return true; +} + + Feature::List FeatureMap::newFeatures() const { Feature::List features; - Feature::List::ConstIterator it; - for ( it = mFeatures.begin(); it != mFeatures.end(); ++it ) { - if ( (*it)->isNew() ) features.append( *it ); + foreach( Feature *f, mFeatures ) { + if ( f->isNew() ) features.append( f ); } return features; } -Feature *FeatureMap::firstFeature() const -{ - return mFirstFeature; -} - QString FeatureMap::featuresAsXml( bool onlyModified ) const { QString xml; - + Feature::List features; + + if (onlyModified) { + features = modifiedFeatures(); + } + else { + features = mFeatures; + } + xml += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; xml += "<k:collection " "xmlns:k=\"http://inttools.suse.de/sxkeeper/schema/keeper\" " - "size=\"" + QString::number( mFeatures.size() ) + "\">\n"; + "size=\"" + QString::number( features.size() ) + "\">\n"; - Feature::List::ConstIterator it; - for( it = mFeatures.begin(); it != mFeatures.end(); ++it ) { - if ( !onlyModified || (*it)->isModified() ) { - xml += featureAsXmlObject( *it ); - } + foreach( Feature *f, features ) { + xml += featureAsXmlObject( f ); } xml += "</k:collection>\n"; @@ -391,7 +394,7 @@ bool FeatureMap::isModified() const { - return (!modifiedFeatures().isEmpty() || (mCache && mCache->hasNewItems())); + return (!hasNoModifiedFeatures() || (mCache && mCache->hasNewItems())); } bool FeatureMap::doQuery( const Query &query ) @@ -443,7 +446,8 @@ return mQueryEngine->doCachedQuery( query ); } else { // do not clear for incremental queries - clearFeatureList(); + // if (!incrementalQueries) { ... + mFeatures.clear(); return mQueryEngine->doQuery( query ); } } @@ -477,7 +481,7 @@ } if( inMemory ) { - if( !silent ) emit currentFeatureChanged( f ); + if( !silent ) emit currentFeatureChanged( mCurrentFeature ); return true; } @@ -545,13 +549,9 @@ if( mRestockIds.isEmpty() ) { emit dataAboutToBeReset(); // Delete old features that are no longer required - clearFeatureList(); + mFeatures.clear(); // Readd the features that are still in memory - Feature::List::ConstIterator it; - for( it = mKeptFeatures.begin(); it != mKeptFeatures.end(); ++it ) { - addFeature( (*it) ); - } - mFeatures = mKeptFeatures; + addFeatures(mKeptFeatures); } if( !mCachedIds.isEmpty() ) @@ -660,8 +660,6 @@ mQueryTiming.start(); - mModifiedFeatures.removeAll( feature ); - if( Prefs::self()->offlineModeEnabled() ) { if( mCache ) { Feature *reloadedFeature = mCache->load( feature->id(), true ); @@ -710,15 +708,17 @@ QString msg = i18n("Reloaded feature #%1%2").arg( f->id() ).arg( s ); emit statusMessage( msg ); - emit featureReloaded( f ); + + f->setModified( false ); + emit featureChanged( f ); if( mCache ) { mCache->removeModifiedItem( f->id() ); } - if( mModifiedFeatures.isEmpty() ) { + if( hasNoModifiedFeatures() ) { mSynch = true; - emit featuresModified( false ); + emit featuresModified(); } emit queryDone( true ); @@ -749,9 +749,8 @@ void FeatureMap::slotSaveDone( const QString &id ) { Feature *f = feature( id ); - if ( !f ) return; - - finishSave( f ); + if ( f ) + finishSave( f ); } void FeatureMap::slotNewSaveDone( Feature *f, const QString &id ) @@ -787,10 +786,10 @@ } else { QTextStream ts(&file); - for( int i = 0; i < mFeatures.size(); ++i ) { - if( mFeatures[i]->isModified() || mFeatures[i]->isNew() ) + foreach( const Feature *feature, mFeatures ) { + if ( feature->isModified() || feature->isNew() ) continue; - ts << mFeatures[i]->id() << endl; + ts << feature->id() << endl; } } } @@ -800,16 +799,8 @@ if( !mCurrentFeature || !mCurrentFeature->isModified() ) return true; - Feature *feature = mCurrentFeature; - // emit currentFeatureAboutToBeSaved(); - - // feature->setModified( true ); // bull shit this is already set to modified mSynch = false; - if( !mModifiedFeatures.contains( feature ) ) { - mModifiedFeatures.append( feature ); - } - if ( askForSaving && !Prefs::self()->offlineModeEnabled() ) { int result = KMessageBox::questionYesNoCancel( mView, @@ -832,33 +823,29 @@ bool FeatureMap::checkSynch( bool synchWithKeeper ) { checkModified( false ); - if( mSynch && newFeatures().isEmpty() ) { + if ( mSynch && newFeatures().isEmpty() ) return true; - } else { - if( Prefs::self()->offlineModeEnabled() && !synchWithKeeper) { - return saveCache( Feature::List( mModifiedFeatures ) ); - } else { - SaveAllDialog dlg( mView, this ); - if( !synchWithKeeper && mCache ) - dlg.setCacheEnabled( true ); - int result = dlg.exec(); - if( result == QDialog::Rejected ) - return false; - else - return true; - } - } + + if ( Prefs::self()->offlineModeEnabled() && !synchWithKeeper) + return saveCache( modifiedFeatures() ); + + SaveAllDialog dlg( mView, this ); + if( !synchWithKeeper && mCache ) + dlg.setCacheEnabled( true ); + + if( dlg.exec() == QDialog::Rejected ) + return false; + return true; } bool FeatureMap::saveCache( const Feature::List &list ) { - if( !validateFeatures( list ) ) + if ( !validateFeatures( list ) ) return false; - if( !mCache ) { + if ( !mCache ) return false; - } Feature::List::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { @@ -868,15 +855,15 @@ } else { recordChange( f ); } - mModifiedFeatures.removeAll( f ); SaveResult r; r.feature = f; r.status = SaveResult::Ok; emit saveFeaturesResult( r ); } - if( mModifiedFeatures.isEmpty() ) { + + if ( hasNoModifiedFeatures() ) { mSynch = true; - emit featuresModified( false ); + emit featuresModified(); } emit saveDone(); return true; @@ -891,12 +878,6 @@ return true; } -bool FeatureMap::saveCurrentFeature() -{ - checkModified( false ); - return saveKeeper( mCurrentFeature ); -} - bool FeatureMap::saveKeeper( Feature *f) { if( !f || !validateFeature( f ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170608-ebd3ef1b/src/libfate/featuremap.h new/fate-20170623-c1270a95/src/libfate/featuremap.h --- old/fate-20170608-ebd3ef1b/src/libfate/featuremap.h 2017-06-08 14:56:14.827454029 +0200 +++ new/fate-20170623-c1270a95/src/libfate/featuremap.h 2017-06-23 13:02:00.425130400 +0200 @@ -1,9 +1,10 @@ /* This file is part of Fate. - Copyright (c) 2005-2007 SUSE LINUX Products GmbH + Copyright (c) 2005-2007, 2014 SUSE LINUX Products GmbH Author: Cornelius Schumacher <cschum(a)suse.de> + Joachim Plack <jplack(a)suse.de> 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 @@ -47,22 +48,16 @@ ~FeatureMap(); void clear(); - void clearFeatureList(); - - void clearPersistantFeatures(); - Feature *feature( const QString &id ); - - const Feature::List &features() const { - return mFeatures; - } + Feature *feature( const QString &id ) const; + Feature *currentFeature() const; + const Feature::List &features() const; Feature::List modifiedFeatures() const; + bool hasNoModifiedFeatures() const; Feature::List newFeatures() const; bool isModified() const; - Feature *firstFeature() const; - QString featuresAsXml( bool onlyModified = false ) const; QString featureAsXmlObject( Feature *feature ) const; @@ -78,7 +73,7 @@ bool checkModified( bool askForSaving ); bool checkSynch( bool dataAboutToChange ); - bool hasModifiedFeatures(); + bool hasCachedModifiedFeatures() const; void invalidateCache(); @@ -91,13 +86,13 @@ void addFeature( Feature * ); void addFeatures(QList<Feature *>); void removeFeature( Feature * ); + void signalFeatureModification( Feature *f = 0 ); bool saveCache( const Feature::List & ); bool saveKeeper( Feature * ); bool saveKeeper( const Feature::List &, SaveEngine::FeedbackMethod m = SaveEngine::SignalFeedback ); bool saveModifiedFeatures(); - bool saveCurrentFeature(); void setCurrentFeature( Feature * ); void cancelSave(); @@ -105,34 +100,40 @@ Feature *origFeature( Feature *f ); signals: + // emit a status message that can be appropriately displayed void statusMessage( const QString & ); + // an asynchronous keeper query has been finished void queryDone( bool ); void dataAboutToBeReset(); // TODO: is dataChanged() the right name for this signal? void dataChanged(); + // a new feature has been added to the feature map void featureAdded( Feature * ); + // a feature in the map has been changed void featureChanged( Feature * ); - void featureReloaded( Feature * ); + // passthrough signal from QueryEngine void connectionEstablished( bool ); + // response to a save-action requester that saving has finished + // and he can check the results void saveDone(); + // passthrough signal from saveEngine plus adequate signal from + // cache handling void saveFeaturesResult( const SaveResult & ); - void featuresModified( bool ); + // all or some features have been modified or removed + void featuresModified(); void currentFeatureChanged( Feature * ); - void currentFeatureRemoved(); - // void currentFeatureAboutToBeSaved(); protected: void finishSave( Feature * ); void finishReload( Feature * ); - bool validateFeature( Feature *feature ); bool validateFeatures( Feature::List features ); bool validateInteractive( Feature *feature ); @@ -154,7 +155,6 @@ private: QMap<QString,Feature *> mIdMap; - Feature *mFirstFeature; Feature *mCurrentFeature; Feature::List mFeatures; Feature::List mKeptFeatures; @@ -163,8 +163,6 @@ Query mCurrentQuery; bool mQueryRunning; - Feature::List mModifiedFeatures; - QueryEngine *mQueryEngine; SaveEngine *mSaveEngine; Timing mQueryTiming;

1 0

Jump to page: