Commit e710053d authored by sjplimp's avatar sjplimp
Browse files

sync with GH

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15746 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 7a4da54a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class RSTMarkup(Markup):

        anchor_pos = href.find('#')

        if anchor_pos >= 0:
        if anchor_pos >= 0 and not href.startswith('http'):
            href = href[anchor_pos+1:]
            return ":ref:`%s <%s>`" % (content, href)

+5 −0
Original line number Diff line number Diff line
@@ -424,6 +424,11 @@ class TestSpecialCommands(unittest.TestCase):
                         "one \n\n"
                         "a :ref:`link <name>` to above\n\n", s)

    def test_external_anchor_link(self):
        s = self.txt2rst.convert('some text "containing a\n'
                                 'link"_http://lammps.sandia.gov/movies.html#granregion with an anchor')
        self.assertEqual('some text `containing a link <http://lammps.sandia.gov/movies.html#granregion>`_ with an anchor\n\n', s)

    def test_define_link_alias(self):
        s = self.txt2rst.convert("one :link(alias,value)\n"
                                 "\"test\"_alias\n")
+1 −1
Original line number Diff line number Diff line
@@ -1557,5 +1557,5 @@ size_t const colvarmodule::cv_prec = 14;
size_t const colvarmodule::cv_width = 21;
size_t const colvarmodule::en_prec  = 14;
size_t const colvarmodule::en_width = 21;
std::string const colvarmodule::line_marker =
const char * const colvarmodule::line_marker = (const char *)
  "----------------------------------------------------------------------\n";
+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public:
  /// Number of characters to represent the collective variables energy
  static size_t const en_width;
  /// Line separator in the log output
  static std::string const line_marker;
  static const char * const line_marker;


  // proxy functions
+2 −1
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ void ImproperClass2::angleangle(int eflag, int vflag)
    if (evflag)
      ev_tally(i1,i2,i3,i4,nlocal,newton_bond,eimproper,
               fabcd[0],fabcd[2],fabcd[3],
               delxAB,delyAB,delzAB,delxBC,delyBC,delzBC,delxBD,delyBD,delzBD);
               delxAB,delyAB,delzAB,delxBC,delyBC,delzBC,
               delxBD-delxBC,delyBD-delyBC,delzBD-delzBC);
  }
}

Loading