Browse Source

Replace Org Babel instances of #+srcname: and #+source: with #+name:

Martyn Jago 8 years ago
parent
commit
257743c4e3

+ 25 - 25
FIXME/o18.org

@@ -17,7 +17,7 @@
 #+SEQ_TODO: TODO(t) STARTED(s)  | DONE(d) REJECTED(r) REFTEX
   
 * LaTeX preamble
-#+srcname: latex-preamble
+#+name: latex-preamble
 #+begin_src latex :tangle o18_ao.tex
     \documentclass[minion,glossaries]{tsdarticle}
     
@@ -61,7 +61,7 @@
 #+end_src
 
 * Introduction
-#+srcname: latex-intro
+#+name: latex-intro
 #+begin_src latex  :tangle o18_ao.tex
 
   The age of the O18 site has been an important datum in Hawaiian
@@ -106,7 +106,7 @@
 #+end_src
 * O18 in regional context [2/2]
 ** DONE Regional context
-#+srcname: regional-context
+#+name: regional-context
 #+begin_src latex  :tangle o18_ao.tex
   \section{The O18 Site}
   \label{sec:O18-site}
@@ -148,7 +148,7 @@
 #+end_src
 
 ** DONE Stratigraphy
-#+srcname: stratigraphy
+#+name: stratigraphy
 #+begin_src latex  :tangle o18_ao.tex
   Excavations for cultural resources management carried out at sites on
   the plain provide data for a model of regional cultural stratigraphy.
@@ -231,7 +231,7 @@
   - 95% hpd 100--509
 ** DONE Age of O18
 
-#+srcname: O18-age
+#+name: O18-age
 #+begin_src latex  :tangle o18_ao.tex 
   \section{Age Determinations and Analysis}
   \label{sec:age-determinations}
@@ -335,7 +335,7 @@
 #+end_src
   
 ** DONE Calibration
-#+srcname: calibration
+#+name: calibration
 #+begin_src latex  :tangle o18_ao.tex
   A Bayesian model of O18 stratigraphy relates each of the dated samples
   to the calendric ages represented by the two primary cultural
@@ -472,7 +472,7 @@
 #+end_src latex
 
 ** DONE Age summary
-#+srcname: age-summary
+#+name: age-summary
 #+begin_src latex  :tangle no
   In summary, the chronology of Site O18 as estimated by \rc\ dates on
   short-lived materials within a Bayesian model appears to begin
@@ -490,7 +490,7 @@
 
 ** DONE Regional data
 
-#+srcname: regional-data
+#+name: regional-data
 #+begin_src latex  :tangle o18_ao.tex
   \section{O18 in Regional Perspective}
   \label{sec:regional-perspective}
@@ -660,7 +660,7 @@
    - alpha 4856, 67% 620-521 BP, 1360--1429 AD
 
 
-#+srcname: regional-analysis-1
+#+name: regional-analysis-1
 #+begin_src latex  :tangle o18_ao.tex
   Based on the current dating evidence, sites 50--80--15--4851 and
   --4853 and 50--80--11--4856 and --4857 were all established after O18.
@@ -723,7 +723,7 @@ than 50--80--11--4856 is 0.88.
   \label{fig:initial-use}
 \end{figure}
 #+END_LaTeX
-#+srcname: regional-analysis-2
+#+name: regional-analysis-2
 #+begin_src latex :tangle o18_ao.tex     
   Another way to look at the site establishment estimates is relative to
   the establishment of O18.  All of the
@@ -754,7 +754,7 @@ than 50--80--11--4856 is 0.88.
          \label{fig:site-establishment} \end{figure}
 #+end_src
 * Conclusion [4/4]
-#+srcname: conclusion
+#+name: conclusion
 #+begin_src latex  :tangle o18_ao.tex 
   \section{Summary and Conclusion}
   \label{sec:conclusion}
@@ -781,7 +781,7 @@ than 50--80--11--4856 is 0.88.
         settlements in Waimanalo that pre-dated O18
     - [ ] Results differ by timing and by the fact that events of
       interest are estimated directly.
-#+srcname: prehistory
+#+name: prehistory
 #+begin_src latex  :tangle o18_ao.tex 
   Seven new \rc\ age determinations on short-lived materials yield a
   chronology for O18 that differs from previous estimates.  The
@@ -903,7 +903,7 @@ than 50--80--11--4856 is 0.88.
     - The Layer III shell dates are all relatively young and a change
       in calibration likely won't affect the estimated establishment
       date
-#+srcname: evaluation
+#+name: evaluation
 #+begin_src latex 
   The incorporation into the Bayesian calibration of a stratigraphic
   model of traditional Hawaiian sites on the Waim\={a}nalo Plain,
@@ -949,7 +949,7 @@ than 50--80--11--4856 is 0.88.
     - It is possible to use dates with large standard deviations: they
       don't mean much, but there is no intrinsic reason to discard what
       little information they might hold.
-#+srcname: hygiene
+#+name: hygiene
 #+begin_src latex 
       
 #+end_src
@@ -959,12 +959,12 @@ than 50--80--11--4856 is 0.88.
        establishment for O18
      - H1 is late, cite Dye NZJA
      - Halawa Dune is late, too.
-#+srcname: hawaii
+#+name: hawaii
 #+begin_src latex 
        
 #+end_src
 * LaTeX postamble
-#+srcname: latex-ending
+#+name: latex-ending
 #+begin_src latex :tangle o18_ao.tex
 % Comment or uncomment as needed
 % style=altlist another possibility
@@ -992,7 +992,7 @@ than 50--80--11--4856 is 0.88.
    - A kludge
    - Put all the csv file names in a table, then edit the table for
      input to the R function
-#+srcname: thetas()
+#+name: thetas()
 #+begin_src shell
 cd r && ls *.csv
 #+End_src
@@ -1011,7 +1011,7 @@ cd r && ls *.csv
 - need to add cbind() an identifier that can be used to label the plot
   and to segregate the plots
 
-#+srcname: dated-events(files = thetas)
+#+name: dated-events(files = thetas)
 #+begin_src R :session :file output_dated_events.png
   library(ggplot2)  
   make.plot.file <- function(x, y)
@@ -1036,7 +1036,7 @@ cd r && ls *.csv
 #+results: dated-events
 [[file:output_dated_events.png]]
 
-#+srcname: single-date(x = "alpha-4856.csv")
+#+name: single-date(x = "alpha-4856.csv")
 #+begin_src R :session
   afile <- paste("r/",x,sep="")
   anobject <- strsplit(x,".",fixed=TRUE)[[1]][1]
@@ -1056,7 +1056,7 @@ cd r && ls *.csv
    - The shell source shows all the csv files
    - Edit the results table to select the files to use as input to the
      plotting routine
-#+srcname: intervals 
+#+name: intervals 
 #+begin_src sh
 cd r && ls *.csv
 #+end_src
@@ -1067,7 +1067,7 @@ cd r && ls *.csv
 | alpha-4856-and-alpha-3.csv |
 | alpha-4857-and-alpha-3.csv |
 
-#+srcname: interval-estimates(files = intervals)
+#+name: interval-estimates(files = intervals)
 #+begin_src R :session :file output_intervals.png
   library(ggplot2)
   
@@ -1096,7 +1096,7 @@ cd r && ls *.csv
 
 ** Regional date graph
    - Hard code a complex graphic
-#+srcname: r-regional-data
+#+name: r-regional-data
 #+begin_src R :session
   library(ggplot2)
   load(".RData")
@@ -1131,7 +1131,7 @@ cd r && ls *.csv
 | methods   |
 | base      |
 
-#+srcname: r-regional-plot
+#+name: r-regional-plot
 #+begin_src R :session
   alpha_plot <- ggplot(alpha_gg, aes(x=1950 + cal.BP, y=Posterior.probability))
   pdf(file="alpha-regional.pdf", height=3.75, width=7.5)
@@ -1161,7 +1161,7 @@ cd r && ls *.csv
 #+end_src
 * REJECTED Post-mortem on earlier data [2/2]
 ** DONE Post mortem data
-#+srcname: post-mortem-data
+#+name: post-mortem-data
 #+begin_src latex
   \section{Post-mortem on the Early Dates}
   \label{sec:post-mortem}
@@ -1236,7 +1236,7 @@ cd r && ls *.csv
 #+end_src
 
 ** DONE Post mortem results
-#+srcname: post-mortem-results
+#+name: post-mortem-results
 #+begin_src latex
   The Bayesian calibration of the early age determinations yields layer
   boundaries that correspond fairly closely to those proposed by

File diff suppressed because it is too large
+ 150 - 150
org-contrib/babel/examples/article-class.org


+ 5 - 5
org-contrib/babel/examples/ascii.org

@@ -25,7 +25,7 @@
   First, (install), load =ascii= package and set org as the default
   output:
 
-#+srcname: ascii-example1
+#+name: ascii-example1
 #+begin_src R :results output code :session ascii
   library(ascii)
   options(asciiType="org")
@@ -37,7 +37,7 @@ Le chargement a nécessité le package : proto
 #+END_SRC
 Then, use =ascii= function:
 
-#+srcname: ascii-example2
+#+name: ascii-example2
 #+begin_src R :results output org :session ascii
   ascii(summary(table(1:4, 1:4)))
 #+end_src
@@ -48,7 +48,7 @@ Then, use =ascii= function:
 - Test for independence of all factors:
   - Chisq = 12, df = 9, p-value = 0.2133
   - Chi-squared approximation may be incorrect
-#+srcname: ascii-example3
+#+name: ascii-example3
 #+begin_src R :results output org :session ascii
 counts <- c(18, 17, 15, 20, 10, 20, 25, 13, 12)
 outcome <- gl(3, 1, 9)
@@ -66,7 +66,7 @@ ascii(glm.D93)
 | outcome3    |    -0.29 |       0.19 |   -1.52 |                 0.13 |
 | treatment2  |     0.00 |       0.20 |    0.00 |                 1.00 |
 | treatment3  |     0.00 |       0.20 |    0.00 |                 1.00 |
-#+srcname: ascii-example4
+#+name: ascii-example4
 #+begin_src R :results output org :session ascii
 ascii(anova(glm.D93))
 #+end_src
@@ -77,7 +77,7 @@ ascii(anova(glm.D93))
 | NULL      |      |          |      8.00 |      10.58 |
 | outcome   | 2.00 |     5.45 |      6.00 |       5.13 |
 | treatment | 2.00 |     0.00 |      4.00 |       5.13 |
-#+srcname: ascii-example5
+#+name: ascii-example5
 #+begin_src R :results output org :session ascii
   ascii(sessionInfo())
 #+end_src

+ 3 - 3
org-contrib/babel/examples/data-collection-analysis.org

@@ -57,7 +57,7 @@
     tangled to an external file and run on the command line -- since
     these runs can take several days, I prefer to run them 
     outside of Emacs (normally using [[http://www.gnu.org/software/screen/][screen]]).
-#+srcname: run-timer-test
+#+name: run-timer-test
 #+begin_src ruby :results silent :tangle timer :exports code
   DEFAULT_CMDLINE = "--swap 0 --del 0 --mut 0.1 example.c "
   
@@ -88,7 +88,7 @@
     Ruby source code block is
     used to collect results from these files and dump them into an
     Org-mode file as a table.
-#+srcname: parse-output
+#+name: parse-output
 #+begin_src ruby :results output raw :exports code
   def look(path)
     processors = if path.match(/normal/)
@@ -140,7 +140,7 @@
     the fake data given above.
 
     *Ruby* calculate mean and standard deviation over the second column
-#+srcname: stddev
+#+name: stddev
 #+begin_src ruby :var raw=example-data :results raw output :exports code
   by_procs = {}
   raw.each do |row|

+ 3 - 3
org-contrib/babel/examples/drift.org

@@ -61,7 +61,7 @@
   generations. We'll make the population larger (N=1000) but still
   start off with 60% red individuals.
 
-#+source: simpledrift(N=1000, X1=600, ngens=100)
+#+name: simpledrift(N=1000, X1=600, ngens=100)
 #+begin_src R :file simpledrift.png :exports both :results graphics
   p <- numeric(ngens)
   p[1] <- X1/N
@@ -104,7 +104,7 @@
 
   To run the simulation:
 
-#+source: drift(N=1000, X1=600, nreps=10, ngens=100)
+#+name: drift(N=1000, X1=600, nreps=10, ngens=100)
 #+begin_src R :session t :file repdrift.png :exports both :results graphics
   p <- drift.faster(N, X1, ngens, nreps)
   matplot(p, type="l", ylim=c(0,1), lty=1)
@@ -113,7 +113,7 @@
   And let's quickly see how much of a speed difference the vectorisation
   makes.
 
-#+source: compare-times(N=1000, X1=600, nreps=1000, ngens=100)
+#+name: compare-times(N=1000, X1=600, nreps=1000, ngens=100)
 #+begin_src R :session t :colnames t :results output :exports both
   functions <- c(drift.slow=drift.slow, drift.faster=drift.faster)
   times <- sapply(functions, function(f) as.numeric(system.time(f(N, X1, ngens, nreps))[1]))

+ 1 - 1
org-contrib/babel/examples/finances.org

@@ -15,7 +15,7 @@ At the of the month, I want to see how much was spent in each
 category.  I wrote the following Babel function to calculate this:
 
 #+begin_src org
-  ,#+srcname: group-categories
+  ,#+name: group-categories
   ,#+begin_src emacs-lisp :var table=daily-expenses :colnames nil
   ,  (defun category-sums (catcol valcol)
   ,    "Sum each of the categories in an Org table.

+ 9 - 9
org-contrib/babel/examples/foo.org

@@ -63,7 +63,7 @@ plain old text interspersed with "code blocks" which are plain old R.
 
 Plots get a little more complicated.  First we make something to plot
 (simulated regression data).
-#+source: reg
+#+name: reg
 #+begin_src R :results output :exports both
   n <- 50
   x <- seq(1, n)
@@ -79,7 +79,7 @@ Plots get a little more complicated.  First we make something to plot
 you want to see what the actual code chunk was).
 
 Figure \ref{fig:one} (p. \pageref{fig:one}) is produced by the following code
-#+srcname: fig1plot
+#+name: fig1plot
 #+begin_src R :exports code
   plot(x, y)
   abline(out1)
@@ -87,7 +87,7 @@ Figure \ref{fig:one} (p. \pageref{fig:one}) is produced by the following code
 Note that =x=, =y=, and =out1= are remembered from the preceding code
 chunk.  We don't have to regenerate them.  All code chunks are part of
 one R "session".
-#+source: fig1
+#+name: fig1
 #+begin_src R :exports results :noweb yes :file fig1.pdf
   <<fig1plot>>
 #+end_src
@@ -100,16 +100,16 @@ one R "session".
 
 Now this was a little tricky.  We did this with two code chunks,
 one visible and one invisible.  First we did
-: #+srcname: fig1plot
+: #+name: fig1plot
 : #+begin_src R :exports code :file fig1plot.pdf
 :   plot(x, y)
 :   abline(out1)
 : #+end_src
 where the =:exports code= indicates that only the return value (not
-code) should be exported and the =#+srcname: fig1plot= gives the code
+code) should be exported and the =#+name: fig1plot= gives the code
 block a name (to be used later).  And "later" is almost immediate.
 Next we did
-: #+source: fig1
+: #+name: fig1
 : #+begin_src R :exports results :noweb yes :file fig1.pdf
 :   <<fig1plot>>
 : #+end_src
@@ -135,7 +135,7 @@ than others.  Note the following virtues
   least by the R in the text).
 - No messing around with sizing or rotations.  It just works!
 
-#+source: fig2
+#+name: fig2
 #+begin_src R :exports results :file fig2.pdf
   out3 <- lm(y ~ x + I(x^2) + I(x^3))
   plot(x, y)
@@ -145,7 +145,7 @@ than others.  Note the following virtues
 Note that if you don't care to show the R code to make the figure, it
 is simpler still.  Figure \ref{fig:two} shows another plot.  What I
 actually typed in =foo.org= was
-: #+srcname: fig2
+: #+name: fig2
 : #+begin_src R :exports results :file fig2.pdf
 :   out3 <- lm(y ~ x + I(x^2) + I(x^3))
 :   plot(x, y)
@@ -203,7 +203,7 @@ Look at =foo.org= for details.)
   dim(foo)
 #+end_src
 
-#+source: foo-as-matrix
+#+name: foo-as-matrix
 #+begin_src R :exports both :results output
   foo <- as.matrix(foo)
   foo

+ 2 - 2
org-contrib/babel/examples/latex-form.org

@@ -37,14 +37,14 @@
 
 *** TODO Your name
     - Enter your full name on the open line below.
-#+srcname: your-name
+#+name: your-name
 #+begin_src latex
 Tom Dye
 #+end_src
 
 *** TODO Your email address
     - Enter your email address on the open line below.
-#+srcname: your-email
+#+name: your-email
 #+begin_src latex
 tsd at tsdye dot com
 #+end_src

+ 14 - 14
org-contrib/babel/examples/org-check.org

@@ -318,7 +318,7 @@ Check an Org-mode environment.
 ** HTML export
 * Commands
 ** Org stuff
-#+srcname: org-library
+#+name: org-library
 #+begin_src emacs-lisp :results silent
   (let (
         (x (locate-library "org"))
@@ -327,20 +327,20 @@ Check an Org-mode environment.
     )
 #+end_src
 
-#+srcname: org-version
+#+name: org-version
 #+begin_src emacs-lisp :results silent
 (if (null org-version) "fail" org-version)  
 #+end_src
 
 ** Package loaded
-#+srcname: pkg-loaded(x)
+#+name: pkg-loaded(x)
 #+begin_src emacs-lisp :results silent
   (if (featurep x) "pass" "fail")
 #+end_src
 
 ** Babel languages
    - Checks if a language can be tangled by Org-babel
-#+srcname: chk-babel-lang(x)
+#+name: chk-babel-lang(x)
 #+begin_src emacs-lisp :results silent
   (let ((z  (mapcar #'(lambda (y)
                 (first y)) org-babel-tangle-langs )
@@ -348,13 +348,13 @@ Check an Org-mode environment.
 #+end_src
 
 ** Check external commands
-#+srcname: chk-ext-cmd(x)
+#+name: chk-ext-cmd(x)
 #+begin_src emacs-lisp :results silent
     (if (org-check-external-command x "" t) "pass" "fail") 
 #+end_src
 
 ** Export LaTeX classes
-#+srcname: chk-ltx-cls
+#+name: chk-ltx-cls
 #+begin_src emacs-lisp :results silent
   (if (null org-export-latex-classes) "fail" "pass")
 #+end_src
@@ -364,7 +364,7 @@ Check an Org-mode environment.
    - This is typically a call to the LaTeX engine
    - If =fail= is returned, then the variable =org-latex-to-pdf-process=
      needs to be set
-#+srcname: chk-latex-engine
+#+name: chk-latex-engine
 #+begin_src emacs-lisp :results silent
   (require 'org-latex)
   (if  (null org-latex-to-pdf-process) "fail" (substring (first org-latex-to-pdf-process) 0 (string-match "\\ " (first org-latex-to-pdf-process))) )
@@ -376,7 +376,7 @@ Check an Org-mode environment.
    - Returns =fail= if  =chk-latex-engine= returns =fail=
    - If =fail= is returned, then the variable =exec-path= probably
      needs to have the path to the LaTeX engine
-#+srcname: chk-engine-cmd
+#+name: chk-engine-cmd
 #+begin_src emacs-lisp :var x=chk-latex-engine :results silent
   (if (string-equal x "fail") x (if (org-check-external-command x "" t)
   "pass" "fail"))
@@ -389,7 +389,7 @@ Check an Org-mode environment.
         - [[elisp:(progn (describe-variable 'org-export-icalendar-combine-agenda-files) (other-window 1))][org-export-icalendar-combine-agenda-files]]
         - others?
    - It is [[http://orgmode.org/manual/Agenda-files.html#Agenda-files][easy to set]]
-#+srcname: chk-agenda-files
+#+name: chk-agenda-files
 #+begin_src emacs-lisp :results silent
   (if (null org-agenda-files)
       "consider setting [[* org-agenda-files][org-agenda-files]]"
@@ -402,7 +402,7 @@ Check an Org-mode environment.
      your system, then check that =$PATH= holds a path to the
      executable
 
-#+srcname: chk-sys-cmd(x)
+#+name: chk-sys-cmd(x)
 #+begin_src sh :results silent
     if which $x > /dev/null;
     then echo pass;
@@ -414,13 +414,13 @@ Check an Org-mode environment.
 ** =check-latex-scale=
 Report the scale setting for inline images.  Default is 1.0.
 
-#+srcname: chk-latex-scale
+#+name: chk-latex-scale
 #+begin_src emacs-lisp :results silent
   (plist-get org-format-latex-options :scale)
 #+end_src
 * Learning Lisp (slowly)                                           :noexport:
 ** Check LaTeX packages
-#+srcname: chk-kpse
+#+name: chk-kpse
 #+begin_src sh :results silent
   if which kpsewhich > /dev/null;
   then echo pass;
@@ -428,7 +428,7 @@ Report the scale setting for inline images.  Default is 1.0.
   fi
 #+end_src
 
-#+srcname: chk-ltx-pkg
+#+name: chk-ltx-pkg
 #+begin_src emacs-lisp :var x=chk-kpse() 
   (if (string-equal x "pass") 
     (let* ((z (org-splice-latex-header org-format-latex-header
@@ -457,7 +457,7 @@ Many thanks to the following people for their generous help:
    - which is used in the shell scripts td wrote to check for latex
      and dvipng commands at the system level
 ** Source
-#+srcname: copy-to-worg
+#+name: copy-to-worg
 #+begin_src sh :exports none :results output
   cd ~/org/worg/
   git pull

+ 5 - 5
org-contrib/babel/examples/short-report.org

@@ -65,7 +65,7 @@
      - State "DONE"       from "TODO"       [2009-11-25 Wed 09:53]
      :END:
 
-#+srcname: field-methods
+#+name: field-methods
 #+begin_src latex
   \section{Field Methods}
   \label{sec:field-methods}
@@ -90,7 +90,7 @@
      - Cite Anell when describing two-piece fishhooks.
      - Use Emory's classification of adzes when describing
        cross-section.
-#+srcname: artifacts
+#+name: artifacts
 #+begin_src latex
   \subsection{Description of Artifacts}
   \label{sec:artifact-description}
@@ -101,7 +101,7 @@
 **** TODO Midden						       :Eric:
      - Use Kay for identifying and naming marine shells
      - Cite Ziegler for information on fish habitats
-#+srcname: midden
+#+name: midden
 #+begin_src latex
   \subsection{Midden}
   \label{sec:midden}
@@ -111,7 +111,7 @@
 
 **** No data entry beyond this line
 
-#+srcname: results
+#+name: results
 #+begin_src latex :noweb
   \section{Results}
   \label{sec:results}
@@ -127,7 +127,7 @@
 *** TODO Introduction
     - Give the reader a brief overview of the project and its results.
 
-#+srcname: intro
+#+name: intro
 #+begin_src latex
   \section{Introduction}
   \label{sec:introduction}

+ 34 - 34
org-contrib/babel/intro.org

@@ -112,7 +112,7 @@ woefully out of date.
 your example, the filename is created in python. I suggest doing it
 slightly differently, something like this.
 
-#+srcname: fileoutput
+#+name: fileoutput
 #+begin_src python :file outfile.txt
  def savetofile(result, filename):
      with open(filename, 'w') as f:
@@ -428,7 +428,7 @@ the last statement and nothing else.
      Consider the result of evaluating this code block with
      scripting mode.
 
-#+srcname: name
+#+name: name
 #+begin_src python :results output
 import time
 print("Hello, today's date is %s" % time.ctime())
@@ -482,13 +482,13 @@ value, =(2 + 2)=, 4 does not appear in the results.
      First let's look at a very simple example. The following source
      code block defines a function, using python, that squares its argument.
 
-#+srcname: square(x=0)
+#+name: square(x=0)
 #+begin_src python
 return x*x
 #+end_src
 
 In the Org-mode file, the function looks like this:
-: #+source: square(x)
+: #+name: square(x)
 : #+begin_src python
 : return x*x
 : #+end_src
@@ -523,7 +523,7 @@ The table looks like this in the Org-mode buffer:
 : | 2 | 4 | 6 | 8 | 10 | 12 | 14 | 16 | 18 | 20 |
 
 The [[http://www.gnu.org/software/emacs/manual/elisp.html][Emacs Lisp]] source code:
-#+srcname: fibonacci-seq(fib-inputs=fibonacci-inputs)
+#+name: fibonacci-seq(fib-inputs=fibonacci-inputs)
 #+begin_src emacs-lisp
   (defun fibonacci (n)
     (if (or (= n 0) (= n 1))
@@ -535,7 +535,7 @@ The [[http://www.gnu.org/software/emacs/manual/elisp.html][Emacs Lisp]] source c
 #+end_src
 
 In the Org-mode buffer the function looks like this:
-: #+srcname: fibonacci-seq(fib-inputs=fibonacci-inputs)
+: #+name: fibonacci-seq(fib-inputs=fibonacci-inputs)
 : #+begin_src emacs-lisp
 :   (defun fibonacci (n)
 :     (if (or (= n 0) (= n 1))
@@ -590,7 +590,7 @@ The data are kept in a table:
 | password | abc123   |
 
 The code block refers to the data table:
-#+srcname: setup-my-account
+#+name: setup-my-account
 #+begin_src emacs-lisp :rownames yes :var data=user-data
   (setq my-special-username (first (first data)))
   (setq my-special-password (first (second data)))
@@ -624,7 +624,7 @@ For example, let's take some system diagnostics in the shell and graph them with
    sizes. Babel automatically converts the output into an Org-mode
    table.
    
-: #+srcname: directories
+: #+name: directories
 : #+begin_src sh :results replace
 :   cd ~ && du -sc * |grep -v total
 : #+end_src
@@ -652,13 +652,13 @@ For example, let's take some system diagnostics in the shell and graph them with
    of the previous code block to obtain the data.
 
 In the Org-mode file: 
-: #+srcname: directory-pie-chart(dirs = directories)
+: #+name: directory-pie-chart(dirs = directories)
 : #+begin_src R :session R-pie-example :file ../../images/babel/dirs.png
 :   pie(dirs[,1], labels = dirs[,2])
 : #+end_src
 
 HTML export of code:
-#+srcname: directory-pie-chart(dirs=directories)
+#+name: directory-pie-chart(dirs=directories)
 #+begin_src R :session R-pie-example :file ../../images/babel/dirs.png
   pie(dirs[,1], labels = dirs[,2])
 #+end_src
@@ -686,7 +686,7 @@ average value of a few numbers. First, let's make some data. The
 following source block creates an Org-mode table filled with five random
 numbers between 0 and 1.
 
-: #+srcname: tbl-example-data()
+: #+name: tbl-example-data()
 : #+begin_src R 
 : runif(n=5, min=0, max=1)
 : #+end_src
@@ -701,13 +701,13 @@ numbers between 0 and 1.
 Now we define a source block to calculate the mean.
 
 In the Org-mode file:
-: #+srcname: R-mean(x)
+: #+name: R-mean(x)
 : #+begin_src R 
 : mean(x)
 : #+end_src
 
 HTML export of code:
-#+srcname: R-mean(x=0)
+#+name: R-mean(x=0)
 #+begin_src R 
 mean(x)
 #+end_src
@@ -780,75 +780,75 @@ HTML export of code:
 
 In the Org-mode file:
 
-: #+srcname: basic-elisp(n)
+: #+name: basic-elisp(n)
 : #+begin_src emacs-lisp
 : (* 2 n)
 : #+end_src
 
 HTML export of code:
 
-#+srcname: basic-elisp(n=0)
+#+name: basic-elisp(n=0)
 #+begin_src emacs-lisp
   (* 2 n)
 #+end_src
 
 In the Org-mode file:
-: #+srcname: basic-shell
+: #+name: basic-shell
 : #+begin_src sh :results silent
 : expr 1 + 5
 : #+end_src
 
 HTML export of code:
-#+srcname: basic-shell
+#+name: basic-shell
 #+begin_src sh :results silent
   expr 1 + 5
 #+end_src
 
 In the Org-mode file:
-: #+srcname: date-simple
+: #+name: date-simple
 : #+begin_src sh :results silent
 : date
 : #+end_src
 
 HTML export of code:
-#+srcname: date-simple
+#+name: date-simple
 #+begin_src sh :results silent
   date
 #+end_src
 
 In the Org-mode file:
-: #+srcname: basic-ruby
+: #+name: basic-ruby
 : #+begin_src ruby :results silent
 : "org-babel"
 : #+end_src
 
 HTML export of code:
-#+srcname: basic-ruby
+#+name: basic-ruby
 #+begin_src ruby :results silent
   "org-babel"
 #+end_src
 
 In the Org-mode file
-: #+srcname: basic-python
+: #+name: basic-python
 : #+begin_src python :results silent
 : 'hello world'
 : #+end_src
 
 HTML export of code:
-#+srcname: basic-python
+#+name: basic-python
 #+begin_src python :results silent
   'hello world'
 #+end_src
 
 In the Org-mode file:
-: #+srcname: basic-R
+: #+name: basic-R
 : #+begin_src R :results silent
 : b <- 9
 : b + 4
 : #+end_src
 
 HTML export of code:
-#+srcname: basic-R
+#+name: basic-R
 #+begin_src R :results silent
   b <- 9
   b + 4
@@ -889,7 +889,7 @@ HTML export of code:
   Org-mode file using the =org-babel-lob-ingest= (bound to =C-c C-v
   l=).
 
-  #+srcname: add-file-to-lob
+  #+name: add-file-to-lob
   #+begin_src emacs-lisp 
   (org-babel-lob-ingest "path/to/file.org")
   #+end_src
@@ -955,25 +955,25 @@ included in the source code file by the third code block, which
 does have a =tangle= header argument.
 
 In the Org-mode file:
-: #+srcname: hello-world-prefix
+: #+name: hello-world-prefix
 : #+begin_src sh :exports none
 :   echo "/-----------------------------------------------------------\\"
 : #+end_src
 
 HTML export of code:
-#+srcname: hello-world-prefix
+#+name: hello-world-prefix
 #+begin_src sh :exports none
   echo "/-----------------------------------------------------------\\"
 #+end_src
 
 In the Org-mode file
-: #+srcname: hello-world-postfix
+: #+name: hello-world-postfix
 : #+begin_src sh :exports none
 :   echo "\-----------------------------------------------------------/"
 : #+end_src
 
 HTML export of code:
-#+srcname: hello-world-postfix
+#+name: hello-world-postfix
 #+begin_src sh :exports none
   echo "\-----------------------------------------------------------/"
 #+end_src
@@ -986,7 +986,7 @@ code blocks.  These references will be expanded during tangling
 to include them in the output file as well.
 
 In the Org-mode file:
-: #+srcname: hello-world
+: #+name: hello-world
 : #+begin_src sh :tangle hello :exports none :noweb yes
 :   <<hello-world-prefix>>
 :   echo "|                       hello world                         |"
@@ -994,7 +994,7 @@ In the Org-mode file:
 : #+end_src
 
 HTML export of code:
-#+srcname: hello-world
+#+name: hello-world
 #+begin_src sh :tangle hello.sh :exports none :noweb yes
   <<hello-world-prefix>>
   echo "|                       hello world                         |"
@@ -1005,7 +1005,7 @@ HTML export of code:
 Calling =org-babel-tangle= will result in the following shell source
 code being written to the =hello.sh= file:
 
-#+srcname: hello-world-output
+#+name: hello-world-output
 #+begin_src sh 
 #!/usr/bin/env sh
 
@@ -1076,7 +1076,7 @@ For a simple example of usage, follow these 5 steps:
    #+end_src
 3) place the following code block in a file called =init.el= in your Emacs
    initialization directory (=~/.emacs.d=).
-   #+srcname: emacs-init
+   #+name: emacs-init
    #+begin_src emacs-lisp 
      ;;; init.el --- Where all the magic begins
      ;;

+ 2 - 2
org-contrib/babel/languages/ob-doc-LaTeX.org

@@ -175,7 +175,7 @@ This example uses the excellent [[http://sourceforge.net/projects/pgf/][pgf/tikz
    - This example creates a graph in R, then inserts it into a LaTeX
      clode block with a noweb reference
 
-: #+srcname: r-complete-weight-histogram
+: #+name: r-complete-weight-histogram
 : #+begin_src R :session adze :file r/adze_wt_log.pdf
 :     adze.wt <- ggplot(whole.adze, aes(x = weight))
 :     adze.wt + geom_histogram() + scale_x_log10()
@@ -208,7 +208,7 @@ depends on the [[http://www.ctan.org/tex-archive/macros/latex/contrib/booktabs/]
 appropriate widths at the top and bottom of a table, as well as within
 the table.
 
-: #+srcname: booktabs-2
+: #+name: booktabs-2
 : #+begin_src emacs-lisp :var table='((:head) hline (:body))
 : (flet ((to-tab (tab)
 :                (orgtbl-to-generic

+ 1 - 1
org-contrib/babel/languages/ob-doc-R.org

@@ -120,7 +120,7 @@ example writes the graphics output to the file specified in the
 =:file= header argument.
 
 #+begin_example
-  ,#+srcname: r-edge-angle-histogram
+  ,#+name: r-edge-angle-histogram
   ,#+begin_src R :results output graphics :var x=whole-adzes :file r/adze_edge_angle.png :width 400 :height 300
     library(ggplot2)
     adze.edge.angle <- ggplot(x, aes(edge_angle))

+ 12 - 12
org-contrib/babel/languages/ob-doc-clojure.org

@@ -200,7 +200,7 @@
      Let's start really simple. We will just test the execution of a
      simple Clojure form. Create an org file and insert the following:
 #+begin_example
-     #+srcname: basic-clojure
+     #+name: basic-clojure
      #+begin_src clojure :results silent
        (+ 1 4)
      #+end_src
@@ -219,7 +219,7 @@
     Clojure src block. Insert the following into your org file:
 
 #+begin_example
-    #+srcname: basic-clojure-table-results
+    #+name: basic-clojure-table-results
     #+begin_src clojure :results value
       [ 1 2 3 4]
     #+end_src
@@ -256,7 +256,7 @@
      
      Create an org file and insert the following:
 #+begin_example
-     #+srcname: basic-session-clojure :session s1
+     #+name: basic-session-clojure :session s1
      #+begin_src clojure :results silent
         (+ 1 4)
      #+end_src
@@ -279,7 +279,7 @@
      Clojure src block. Insert the following into your org file:
 
 #+begin_example
-     #+srcname: basic-session-clojure-table-results
+     #+name: basic-session-clojure-table-results
      #+begin_src clojure :session s1 :results value
         [ 1 2 3 4]
      #+end_src
@@ -305,22 +305,22 @@
      
      Create an org file with the following content:
 #+begin_example
-     #+srcname: set-clojure-session-var-s1
+     #+name: set-clojure-session-var-s1
      #+begin_src clojure :session s1 :results value
      (def *var* [1 2 3])
      #+end_src
      
-     #+srcname: set-clojure-session-var-s2
+     #+name: set-clojure-session-var-s2
      #+begin_src clojure :session s2 :results value
      (def *var* [3 4 5 6 7 8 9])
      #+end_src
 
-     #+srcname: get-clojure-session-var-s1
+     #+name: get-clojure-session-var-s1
      #+begin_src clojure :session s1 :results value
      (count *var*)
      #+end_src
      
-     #+srcname: get-clojure-session-var-s2
+     #+name: get-clojure-session-var-s2
      #+begin_src clojure :session s2 :results value
      (count *var*)
      #+end_src
@@ -336,7 +336,7 @@
      after the respective block. The resulting buffer should look
      something like this:
 #+begin_example
-     #+srcname: set-clojure-session-var-s1
+     #+name: set-clojure-session-var-s1
      #+begin_src clojure :session s1 :results value
      (def *var* [1 2 3])
      #+end_src
@@ -344,7 +344,7 @@
      #+results: set-clojure-session-var-s1
      : #'user/*var*
 
-     #+srcname: set-clojure-session-var-s2
+     #+name: set-clojure-session-var-s2
      #+begin_src clojure :session s2 :results value
      (def *var* [3 4 5 6 7 8 9])
      #+end_src
@@ -352,7 +352,7 @@
      #+results: set-clojure-session-var-s2
      : #'user/*var*
 
-     #+srcname: get-clojure-session-var-s1
+     #+name: get-clojure-session-var-s1
      #+begin_src clojure :session s1 :results value
      (count *var*)
      #+end_src
@@ -360,7 +360,7 @@
      #+results: get-clojure-session-var-s1
      : 3
 
-     #+srcname: get-clojure-session-var-s2
+     #+name: get-clojure-session-var-s2
      #+begin_src clojure :session s2 :results value
      (count *var*)
      #+end_src

+ 7 - 7
org-contrib/babel/languages/ob-doc-ledger.org

@@ -34,7 +34,7 @@ use it, enable Ledger support.  Check the [[http://orgmode.org/worg/org-contrib/
 Worg]] for instructions on how to achieve this but I currently do this
 directly as follows:
 
-#+srcname: babel-language-setup
+#+name: babel-language-setup
 #+begin_src emacs-lisp 
 (org-babel-do-load-languages
  'org-babel-load-languages
@@ -86,7 +86,7 @@ within an org file is to use a single source block to record all
 Ledger entries.  The following is an example source block:
 
 #+begin_example
-,#+srcname: allinone
+,#+name: allinone
 ,#+begin_src ledger
 2010/01/01 * Starting balance
   assets:bank:savings  £1300.00
@@ -163,7 +163,7 @@ these into /expenses/ and /income/, as follows:
     to later must have the =:noweb yes= babel header argument specified.
 
 #+begin_example
-,#+srcname: income
+,#+name: income
 #+begin_src ledger :noweb yes
 2010/01/01 * Starting balance
   assets:bank:savings  £1300.00
@@ -190,7 +190,7 @@ these into /expenses/ and /income/, as follows:
     but could have been done individually.
 
 #+begin_example
-,#+srcname: expenses
+,#+name: expenses
 #+begin_src ledger :noweb yes
 2010/07/23 Rent
   expenses:rent  £500.00
@@ -219,7 +219,7 @@ these into /expenses/ and /income/, as follows:
       to by the =<<income>>= and =<<expenses>>== lines.
 
 #+begin_example
-,#+srcname: balance
+,#+name: balance
 #+begin_src ledger :cmdline bal :noweb yes
 <<income>>
 <<expenses>>
@@ -264,7 +264,7 @@ to tell Ledger to include sub-accounts in the report.
       if all the entries are correct).
 
 #+begin_example
-,#+srcname: monthlyregister
+,#+name: monthlyregister
 ,#+begin_src ledger :cmdline -M reg :noweb yes
 <<income>>
 <<expenses>>
@@ -288,7 +288,7 @@ these are increasing (or decreasing!).  In this case, the final column
 will be the running total of the =assets= in our ledger.
 
 #+begin_example
-,#+srcname: monthlyassetsregister
+,#+name: monthlyassetsregister
 ,#+begin_src ledger :cmdline -M reg assets :noweb yes
 <<income>>
 <<expenses>>

+ 3 - 3
org-contrib/babel/languages/ob-doc-oz.org

@@ -209,7 +209,7 @@ You can see in the Oz Compiler buffer the actual Oz code generated
 from such calls (org-babel-oz automatically surrounds the code block
 by a =local= statement, i.e. declares these variables).
 
-: #+srcname: browse(X)
+: #+name: browse(X)
 : #+begin_src oz
 :   {Browse X}
 : #+end_src
@@ -219,7 +219,7 @@ Oz syntax).
 
 : #+lob: browse2(X=3, Y=7)
 
-: #+srcname: browse2(X, Y)
+: #+name: browse2(X, Y)
 : #+begin_src oz :results output
 :   {Browse X#Y}
 : #+end_src
@@ -248,7 +248,7 @@ chunk in this literate programming example. Note that the order of
 code block definitions is not the order in which these code blocks
 (chunks) appear in the resulting program!
 
-: #+srcname: declaration
+: #+name: declaration
 : #+begin_src oz :results output
 :   declare
 :   X = 7

+ 4 - 4
org-contrib/babel/library-of-babel.org

@@ -42,7 +42,7 @@
 ** R
   Plot column 2 (y axis) against column 1 (x axis). Columns 3 and beyond, if present, are ignored.
 
-#+srcname: R-plot(data=R-plot-example-data)
+  #+name: R-plot(data=R-plot-example-data)
 #+begin_src R :session *R*
 plot(data)
 #+end_src
@@ -85,7 +85,7 @@ plot(data)
 
 *** Transposing a matrix
 ***** Emacs lisp
-#+srcname: transpose-elisp(table)
+#+name: transpose-elisp(table)
 #+begin_src emacs-lisp
   (apply #'mapcar* #'list table)
 #+end_src
@@ -105,13 +105,13 @@ plot(data)
 
 *** Binding tables together by columns
 ***** Emacs lisp
-#+srcname: column-bind-elisp(a=tab1, b=tab2)
+#+name: column-bind-elisp(a=tab1, b=tab2)
 #+begin_src emacs-lisp 
 (mapcar* 'append a b)
 #+end_src
 
 ***** R
-#+srcname: column-bind-R(a=tab3, b=tab4)
+#+name: column-bind-R(a=tab3, b=tab4)
 #+begin_src R :colnames yes
 cbind(a, b)
 #+end_src

+ 4 - 4
org-issues.org

@@ -3284,7 +3284,7 @@ CLOSED: [2010-05-31 Mo 12:00]
 
     - Gmane :: [[http://mid.gmane.org/20100526162001.GA32657%40soloJazz.com][use of org-export-latex-verbatim-wrap]]
 
-** DONE Tangle multiple sections source blocks into single file without #+source: ... :Babel:
+** DONE Tangle multiple sections source blocks into single file without #+name: ... :Babel:
 CLOSED: [2010-05-31 Mo 12:01]
   [2010-05-28 Fr]
   :PROPERTIES:
@@ -3296,7 +3296,7 @@ CLOSED: [2010-05-31 Mo 12:01]
   :ARCHIVE_TODO: CLOSED
   :END:
 
-    - Gmane :: [[http://mid.gmane.org/AANLkTilIKIH267lSBI4pqc82Yzz45PQwLDWf12aoMu%5Fy%40mail%2Egmail%2Ecom][(babel) Tangle multiple sections source blocks into single file without #+source: ...]]
+    - Gmane :: [[http://mid.gmane.org/AANLkTilIKIH267lSBI4pqc82Yzz45PQwLDWf12aoMu%5Fy%40mail%2Egmail%2Ecom][(babel) Tangle multiple sections source blocks into single file without #+name: ...]]
 ** DONE buffer-wide settings for R graphical header arguments              :Babel:
 CLOSED: [2010-06-01 Di 09:07]
   [2010-05-28 Fr]
@@ -12338,7 +12338,7 @@ CLOSED: [2010-09-20 Mo 20:18]
 
     - Gmane :: [[http://mid.gmane.org/4C96340C%2E9040102%40gmail%2Ecom][Tags in Agenda View]]
 
-** DONE #+source line in export
+** DONE #+name line in export
 CLOSED: [2010-09-20 Mo 20:18]
 :LOGBOOK:
 - State "DONE"       from "NEW"        [2010-09-20 Mo 20:18]
@@ -12354,7 +12354,7 @@ CLOSED: [2010-09-20 Mo 20:18]
 :ARCHIVE_ITAGS: new
 :END:
 
-    - Gmane :: [[http://mid.gmane.org/30B428E9%2DD657%2D4B5C%2D946D%2D2B2BB1137DEA%40tsdye%2Ecom][#+source line in export]]
+    - Gmane :: [[http://mid.gmane.org/30B428E9%2DD657%2D4B5C%2D946D%2D2B2BB1137DEA%40tsdye%2Ecom][#+name line in export]]
 
 ** DONE exporting to a specified directory
 CLOSED: [2010-09-22 Mi 09:29]

+ 1 - 1
org-tutorials/org-beamer/presentation.org

@@ -83,7 +83,7 @@ with its own headline, is displayed in a block:
     :BEAMER_col: 0.45
     :BEAMER_env: block
     :END:
-#+srcname: octaveexample
+#+name: octaveexample
 #+begin_src octave :results output :exports both
 A = [1 2 ; 3 4]
 b = [1; 1];

+ 1 - 1
org-tutorials/org-beamer/tutorial.org

@@ -252,7 +252,7 @@ For instance, the following code:
     :BEAMER_col: 0.45
     :BEAMER_env: block
     :END:
-,#+srcname: octaveexample
+,#+name: octaveexample
 ,#+begin_src octave :results output :exports both
 A = [1 2 ; 3 4]
 b = [1; 1];

+ 36 - 36
org-tutorials/org-latex-export.org

@@ -225,7 +225,7 @@ example only calls it if it would add a LaTeX class that isn't
 already on the =org-export-latex-classes= list:
 
 #+begin_example 
-  #+source: setup
+  #+name: setup
   #+begin_src emacs-lisp :results silent :exports none
  (unless (find "per-file-class" org-export-latex-classes :key 'car
            :test 'equal)
@@ -276,7 +276,7 @@ their effect is local to the Org-mode buffer.
 An example custom class definition that adds the =graphicx= package
 might look like this in =.emacs=:
 
-#+source: custom-class-definition
+#+name: custom-class-definition
 #+begin_src emacs-lisp :exports code
   (add-to-list 'org-export-latex-classes
                '("per-file-class"
@@ -308,7 +308,7 @@ following lines, which load the =xcolor= package[fn:4] and then use
 named colors to distinguish external blue links from internal red
 links:
 
-#+source: hyperref-header
+#+name: hyperref-header
 #+begin_src org :exports code
   ,  #+LATEX_HEADER: \usepackage[hyperref,x11names]{xcolor}
   ,  #+LATEX_HEADER: \usepackage[colorlinks=true,urlcolor=SteelBlue4,linkcolor=Firebrick4]{hyperref}
@@ -318,7 +318,7 @@ In addition, you can pick up the encoding used in the Org-mode buffer and pass
 this information on to LaTeX by loading the =inputenc= package as
 follows:
 
-#+source: inputenc
+#+name: inputenc
 #+begin_src org :exports code
   #+LATEX_HEADER: \usepackage[AUTO]{inputenc}
 #+end_src
@@ -348,7 +348,7 @@ file.  Note that you should check that =texi2dvi= is installed on your
 system and that it works correctly before adding this code to your
 =.emacs=. 
  
-#+source: texi2dvi
+#+name: texi2dvi
 #+begin_src emacs-lisp :exports code
 (setq org-latex-to-pdf-process '("texi2dvi --pdf --clean --verbose --batch %f"))
 #+end_src
@@ -556,7 +556,7 @@ to make the Org-mode LaTeX exporter conform to the semantic markup
 defined in arbitrary style files.  Org-mode will even complete your
 new link type!
 
-#+source: semantic-markup
+#+name: semantic-markup
 #+begin_src emacs-lisp :exports code
   (org-add-link-type
    "latex" nil
@@ -619,7 +619,7 @@ executive summary between the title and the table of contents.
 Fortunately, the LaTeX exporter is coded in such a way that it is
 possible for the user to alter this behavior relatively easily.
 
-#+source: format-no-toc
+#+name: format-no-toc
 #+begin_src emacs-lisp :exports code
 (defun org-export-latex-no-toc (depth)  
     (when depth
@@ -757,7 +757,7 @@ source code.
 , #+LaTeX_HEADER: \usemintedstyle{emacs}
 , #+LaTeX_HEADER: \newminted{common-lisp}{fontsize=\footnotesize}
 
-, #+source: setup-minted
+, #+name: setup-minted
 , #+begin_src emacs-lisp :exports both :results silent
      (setq org-export-latex-listings 'minted)
      (setq org-export-latex-custom-lang-environments
@@ -774,7 +774,7 @@ source code.
              "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"))
 , #+end_src
 
-, #+source: another-listing
+, #+name: another-listing
 , #+begin_src python :exports code
    x = str(y)
 , #+end_src
@@ -823,7 +823,7 @@ typeset an inline code snippet.
 , #+LaTeX_HEADER: {}
 , #+LaTeX_HEADER: \newcommand{\python}[1]{\lstset{language={Python},basicstyle={\ttfamily\small}}\lstinline{#1}}
 
-, #+source: setup-listings
+, #+name: setup-listings
 , #+begin_src emacs-lisp :exports both :results silent
   (setq org-export-latex-listings 'listings)
   (setq org-export-latex-custom-lang-environments
@@ -847,7 +847,7 @@ typeset an inline code snippet.
        (format "\\%s{%s}" path desc)))))
 , #+end_src
 
-, #+source: another-listing
+, #+name: another-listing
 , #+begin_src python :exports code
   x = str(y)
 , #+end_src
@@ -941,7 +941,7 @@ somewhere the LaTeX exporter won't see, perhaps in a sub-tree tagged with
 
 Finally, create a LaTeX source block something like this:
 
-: #+source: tabularx-export
+: #+name: tabularx-export
 : #+begin_src latex :exports results :results latex
 :   \begin{table}[htb!]
 :   \centering
@@ -1023,7 +1023,7 @@ determined in LaTeX by the font size of =\normalsize=.  Note that
 =\scriptsize= can be replaced by another legal LaTeX font size, such
 as =\footnotesize= or =\small=.
 
-#+source: scripttab
+#+name: scripttab
 #+begin_src latex :exports code
 \makeatletter
 \def \@floatboxreset {%
@@ -1394,7 +1394,7 @@ the LaTeX exporter.  The following link types insert the natbib
 citation commands, using an optional command if the citation link
 includes a description.
 
-#+source: define-citep-link
+#+name: define-citep-link
 #+begin_src emacs-lisp :results silent
   (org-add-link-type 
    "citep" 'ebib
@@ -1407,7 +1407,7 @@ includes a description.
 )))))
 #+end_src
 
-#+source: define-citet-link
+#+name: define-citet-link
 #+begin_src emacs-lisp :results silent
   (org-add-link-type 
    "citet" 'ebib
@@ -1420,7 +1420,7 @@ includes a description.
 )))))
 #+end_src
 
-#+source: define-citealt-link
+#+name: define-citealt-link
 #+begin_src emacs-lisp :results silent
   (org-add-link-type 
    "citealt" 'ebib
@@ -1433,7 +1433,7 @@ includes a description.
 )))))
 #+end_src
 
-#+source: define-citealp-link
+#+name: define-citealp-link
 #+begin_src emacs-lisp 
   (org-add-link-type 
    "citealp" 'ebib
@@ -1446,7 +1446,7 @@ includes a description.
          )))))
 #+end_src
 
-#+source: define-citealtstar-link
+#+name: define-citealtstar-link
 #+begin_src emacs-lisp 
   (org-add-link-type 
    "citealt*" 'ebib
@@ -1459,7 +1459,7 @@ includes a description.
          )))))
 #+end_src
 
-#+source: define-citealpstar-link
+#+name: define-citealpstar-link
 #+begin_src emacs-lisp 
   (org-add-link-type 
    "citealp*" 'ebib
@@ -1472,7 +1472,7 @@ includes a description.
          )))))
 #+end_src
 
-#+source: define-citepstar-link
+#+name: define-citepstar-link
 #+begin_src emacs-lisp 
   (org-add-link-type 
    "citep*" 'ebib
@@ -1485,7 +1485,7 @@ includes a description.
          )))))
 #+end_src
 
-#+source: define-citetstar-link
+#+name: define-citetstar-link
 #+begin_src emacs-lisp 
   (org-add-link-type 
    "citet*" 'ebib
@@ -1510,7 +1510,7 @@ on a semicolon, so that, e.g.,
 =\cite[prenote][postnote]{foo}=.  Note that =[[cite:foo]]= and
 =[[cite:foo][;]]= are functionally equivalent.  
  
-#+source: define-standard-biblatex-commands
+#+name: define-standard-biblatex-commands
 #+begin_src emacs-lisp :noweb yes :results silent :exports code
   <<define-biblatex-cite-link>>
   <<define-biblatex-cap-cite-link>>
@@ -1521,7 +1521,7 @@ on a semicolon, so that, e.g.,
 
 #+end_src
 
-#+source: define-biblatex-cite-link
+#+name: define-biblatex-cite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "cite" 'ebib
@@ -1537,7 +1537,7 @@ on a semicolon, so that, e.g.,
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-cap-cite-link
+#+name: define-biblatex-cap-cite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "Cite" 'ebib
@@ -1553,7 +1553,7 @@ on a semicolon, so that, e.g.,
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-parencite-link
+#+name: define-biblatex-parencite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "parencite" 'ebib
@@ -1569,7 +1569,7 @@ on a semicolon, so that, e.g.,
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-cap-parencite-link
+#+name: define-biblatex-cap-parencite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "Parencite" 'ebib
@@ -1585,7 +1585,7 @@ on a semicolon, so that, e.g.,
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-footcite-link
+#+name: define-biblatex-footcite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "footcite" 'ebib
@@ -1601,7 +1601,7 @@ on a semicolon, so that, e.g.,
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-footcitetext-link
+#+name: define-biblatex-footcitetext-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "footcitetext" 'ebib
@@ -1622,7 +1622,7 @@ on a semicolon, so that, e.g.,
 These commands can only be used by some of the citation styles that
 ship with biblatex.
 
-#+source: define-style-specific-biblatex-commands
+#+name: define-style-specific-biblatex-commands
 #+begin_src emacs-lisp :noweb yes :results silent :exports code
   <<define-biblatex-textcite-link>>
   <<define-biblatex-cap-textcite-link>>
@@ -1633,7 +1633,7 @@ ship with biblatex.
   <<define-biblatex-supercite-link>>
 #+end_src
 
-#+source: define-biblatex-textcite-link
+#+name: define-biblatex-textcite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "textcite" 'ebib
@@ -1649,7 +1649,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-cap-textcite-link
+#+name: define-biblatex-cap-textcite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "Textcite" 'ebib
@@ -1665,7 +1665,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-smartcite-link
+#+name: define-biblatex-smartcite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "smartcite" 'ebib
@@ -1681,7 +1681,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-cap-smartcite-link
+#+name: define-biblatex-cap-smartcite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "Smartcite" 'ebib
@@ -1697,7 +1697,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-citestar-link
+#+name: define-biblatex-citestar-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "cite*" 'ebib
@@ -1713,7 +1713,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-parencitestar-link
+#+name: define-biblatex-parencitestar-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "parencite*" 'ebib
@@ -1729,7 +1729,7 @@ ship with biblatex.
                  (car (split-string desc ";"))  path))))))
 #+end_src
 
-#+source: define-biblatex-supercite-link
+#+name: define-biblatex-supercite-link
 #+begin_src emacs-lisp :results silent :exports code
   (org-add-link-type 
    "supercite" 'ebib