Ignore:
Timestamp:
Mar 20, 2018, 4:22:15 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
101a4d2
Parents:
1bdd261 (diff), f810e09 (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' into references

Location:
doc/papers/concurrency/AMA
Files:
206 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • doc/papers/concurrency/AMA/AMA-stix/ama/WileyNJD-AMA.bst

    r1bdd261 r8669cd3  
    361361{ year empty$
    362362    { "" }
    363     { "" * year }
     363    { " " * year }
    364364  if$
    365365}
    … …  
    501501    { "In: "
    502502      editor empty$
    503     'skip$
    504     { " " * format.editors * " " * booktitle emphasize * ", " * }
     503      { booktitle emphasize * }
     504      { " " * format.editors * " " * booktitle emphasize * ", " * }
    505505      if$
    506506    }
    … …  
    819819  crossref missing$
    820820    { format.in.ed.booktitle "booktitle" output.check
     821      blank.sep
    821822      format.bvolume output
    822823      format.number.series output
     824      new.block
    823825      format.pages output
    824826      organization output
    … …  
    841843{ output.bibitem
    842844  author empty$
    843     { organization empty$
    844     'skip$
    845     { organization output.nonnull
    846       address output
     845    { new.block organization empty$
     846    'skip$
     847    { new.block organization output.nonnull
     848      new.block address output
    847849    }
    848850      if$
    … …  
    852854  format.btitle "title" output.check
    853855  author empty$
    854     { organization empty$
    855     { address new.block.checka
     856    { new.block organization empty$
     857    { new.block address new.block.checka
    856858      address output
    857859    }
    … …  
    859861      if$
    860862    }
    861     { organization address new.block.checkb
     863    { new.block organization new.block address new.block.checkb
    862864      organization output
    863865      address output
    864866    }
    865867  if$
     868  new.block
    866869  format.edition output
     870  new.block
    867871  format.date output
    868872  new.block
    … …  
    877881  blank.sep
    878882  "Master's thesis" format.thesis.type output.nonnull
     883  new.block
    879884  school "school" output.check
    880885  address output
    … …  
    907912  if$
    908913  howpublished output
     914  new.block
    909915  format.note output
    910   %%new.block
     916  new.block
    911917  format.date output
    912918  fin.entry
Note: See TracChangeset for help on using the changeset viewer.