![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
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@suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner@suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner@suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- 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@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@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@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@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@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@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@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@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@gmx.de) - Adapted to Springer Vieweg Verlag @@ -40,12 +51,12 @@ 2004/08/19 v1.32 Harald Harders (h.harders@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@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@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@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@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@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@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 \@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 \@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 \@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@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-te... @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-date... @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/biblatex-apa/}, + url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@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 Tušar and Bogdan Filipič 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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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") 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@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@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@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@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@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@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@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@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@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.bib). + +## 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@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}} + +@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}} + +@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}} - -@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}} - -@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@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@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} +} +@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} +} +@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@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@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@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@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@iffileloaded{verbose-trad2.cbx}}% + or test{\ltx@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@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@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@version{1.2} -\def\bpl@rdate{2016/05/12} +\def\bpl@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@version{1.2} -\def\bpl@rdate{2016/05/12} +\def\bpl@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@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@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@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@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@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@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@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@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