Ignore:
Timestamp:
Apr 20, 2018, 9:04:41 AM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc
Children:
22bdc34
Parents:
9181f1d (diff), 88f15ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 moved

Legend:

Unmodified
Added
Removed
  • doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst.orig

    r9181f1d re6d39fe  
    361361{ year empty$
    362362    { "" }
    363     { " " * year }
     363    { "" * year }
    364364  if$
    365365}
     
    501501    { "In: "
    502502      editor empty$
    503       { booktitle emphasize * }
    504       { " " * format.editors * " " * booktitle emphasize * ", " * }
     503    'skip$
     504    { " " * format.editors * " " * booktitle emphasize * ", " * }
    505505      if$
    506506    }
     
    819819  crossref missing$
    820820    { format.in.ed.booktitle "booktitle" output.check
    821       blank.sep
    822821      format.bvolume output
    823822      format.number.series output
    824       new.block
    825823      format.pages output
    826824      organization output
     
    843841{ output.bibitem
    844842  author empty$
    845     { new.block organization empty$
    846     'skip$
    847     { new.block organization output.nonnull
    848       new.block address output
     843    { organization empty$
     844    'skip$
     845    { organization output.nonnull
     846      address output
    849847    }
    850848      if$
     
    854852  format.btitle "title" output.check
    855853  author empty$
    856     { new.block organization empty$
    857     { new.block address new.block.checka
     854    { organization empty$
     855    { address new.block.checka
    858856      address output
    859857    }
     
    861859      if$
    862860    }
    863     { new.block organization new.block address new.block.checkb
     861    { organization address new.block.checkb
    864862      organization output
    865863      address output
    866864    }
    867865  if$
    868   new.block
    869866  format.edition output
    870   new.block
    871867  format.date output
    872868  new.block
     
    881877  blank.sep
    882878  "Master's thesis" format.thesis.type output.nonnull
    883   new.block
    884879  school "school" output.check
    885880  address output
     
    912907  if$
    913908  howpublished output
    914   new.block
    915909  format.note output
    916   new.block
     910  %%new.block
    917911  format.date output
    918912  fin.entry
Note: See TracChangeset for help on using the changeset viewer.