mathematical 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2207bcef44b1c9ae1c2dd1b1f7348c5fd70ce47b
-  data.tar.gz: 88f6e65f7fad7e0f1ffb8f346f105f303632dccc
+  metadata.gz: d7a4bff6736d2664d969ed7c8f3e1c4cf35f13a6
+  data.tar.gz: be688b14b197b88d6b940e56cd9b55f4167c4adc
 SHA512:
-  metadata.gz: 29066ed876e4164a42a493db07949ce1d788012337ede737028fa31f5ee536959a777406be1d704bead5cca94afb32f0f8d7782f2cd0619db5a78ae1e1c1cb0c
-  data.tar.gz: dee14be9d6b0210864e6b7d7e2037f5ceca27607e27868e8ff31195f64be719b4b0e9b4b50b72579bac9ca6d58da6994ebbb4f5208e72e911143c963fc1fb215
+  metadata.gz: c58f0a6c43716fccbf796add27840f30bd384dff6d738fe7d226540fc316d594b10aa512050061a4e9a76bd3e783021926ce48a99e1d402c5e3bef715a2acd7b
+  data.tar.gz: 54dfda24dd285749cb05c5a032cab1a523c2c62993597820cf3377d98250cc4123b9c1e8c1e11103633537c22eebe1682f30f21ccfab9b97f04e06e56311a84f

data/ext/mathematical/mtex2MML/src/lexer.l

@@ -1052,6 +1052,9 @@ int display_style = 0;
 "\\color"        {BEGIN(ATTRIBUTELIST); return COLOR;}
 "\\bgcolor"        {BEGIN(ATTRIBUTELIST); return BGCOLOR;}
 
+"\\label"         {BEGIN(ATTRIBUTELIST); return LABEL;}
+"\\tag"          {BEGIN(ATTRIBUTELIST); return TAG;}
+
 "\\bbox"         {BEGIN(BRACKETLIST); return BBOX;}
 
 "\\displaystyle"  {mtex2MML_displaymode=1; mtex2MML_rowposn=2; display_style = 1; return DISPLAY;}
@@ -1265,7 +1268,7 @@ int display_style = 0;
 .              {return UNKNOWNCHAR;}
 }
 
-<ATTRIBUTELIST>"{"[ \t\n\r #a-zA-Z0-9.\-]*"}"  {BEGIN(MATH); yylval=mtex2MML_copy_string(yytext); if (yylval != mtex2MML_empty_string) { yylval[0]='"'; yylval[yyleng-1]='"'; } return ATTRLIST;}
+<ATTRIBUTELIST>"{"[ \t\n\r #a-zA-Z0-9.:\-]*"}"  {BEGIN(MATH); yylval=mtex2MML_copy_string(yytext); if (yylval != mtex2MML_empty_string) { yylval[0]='"'; yylval[yyleng-1]='"'; } return ATTRLIST;}
 
 <BRACKETLIST>{
 "\["  {return ST;}

data/ext/mathematical/mtex2MML/src/parser.y

@@ -315,7 +315,7 @@ yydebug = 1;
 %}
 
 %left TEXOVER TEXOVERWITHDELIMS TEXATOP TEXATOPWITHDELIMS TEXABOVE TEXABOVEWITHDELIMS
-%token CHAR STARTMATH STARTDMATH ENDMATH MTEXT MI MIB MN MO LIMITS NOLIMITS SUP SUB MROWOPEN MROWCLOSE MATHOPEN MATHCLOSE MATHORD MATHPUNCT VCENTER LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL BIGM BBIGM BIGGM BBIGGM FRAC TFRAC DFRAC CFRAC GENFRAC OPERATORNAME MATHOP MATHBIN MATHREL MATHINNER MOP MOL MOLL MOF MOR PERIODDELIM COMMADELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT OF LEFTROOT UPROOT BINOM TBINOM BRACE BRACK CHOOSE DBINOM UNDER BUILDREL OVER OVERBRACE OVERBRACKET UNDERLINE UNDERBRACE UNDERBRACKET UNDEROVER TENSOR MULTI ALIGNATVALUE ARRAYALIGN COLUMNALIGN ARRAY SPACECUBE HSPACE MOVELEFT MOVERIGHT RAISE LOWER PXSTRING COLSEP COLSEPSPACE ROWSEP NEWLINE ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS SANS TT ENCLOSE ENCLOSENOTATION ENCLOSEATTR ENCLOSETEXT BOLD BOXED FBOX HBOX MBOX BCANCELED XCANCELED CANCELEDTO NOT SLASHED PMB SCR RM BB ST END BBLOWERCHAR BBUPPERCHAR BBDIGIT CALCHAR FRAKCHAR CAL FRAK CLAP LLAP RLAP ROWOPTS TEXTSIZE OLDSTYLE SCSTY SCSIZE SCSCSIZE TINY TTINY SMALL NORMALSIZE LARGE LLARGE LLLARGE HUGE HHUGE DISPLAY TEXTSTY TEXTBOX TEXTSTRING COLORSTRING STYLESTRING VERBBOX VERBSTRING ACUTE GRAVE BREVE MATHRING XMLSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE ENSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE NEGMEDSPACE NEGTHICKSPACE STRUT MATHSTRUT SMASH PHANTOM HPHANTOM VPHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOOLTIP TOGGLE TOGGLESTART TOGGLEEND FGHIGHLIGHT BGHIGHLIGHT COLORBOX SPACE NUMBER INTONE INTTWO INTTHREE OVERLEFTARROW OVERLEFTRIGHTARROW OVERRIGHTARROW UNDERLEFTARROW UNDERLEFTRIGHTARROW UNDERRIGHTARROW BAR WIDEBAR SKEW VEC WIDEVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT DDDOT DDDDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV EQUATION EQUATION_STAR EQALIGN EQALIGNNO MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SUBARRAY SVG ENDSVG SMALLMATRIX CASES ALIGNED ALIGNENV ALIGNENV_STAR ALIGNAT ALIGNAT_STAR ALIGNEDAT GATHERED EQNARRAY EQNARRAY_STAR MULTLINE MULTLINE_STAR GATHER_STAR GATHER SUBSTACK SIDESET BMOD PMOD POD RMCHAR SCRCHAR PMBCHAR COLOR BGCOLOR BBOX XARROW OPTARGOPEN OPTARGCLOSE MTEXNUM RAISEBOX NEG LATEXSYMBOL TEXSYMBOL VARINJLIM VARLIMINF VARLIMSUP VARPROJLIM
+%token CHAR STARTMATH STARTDMATH ENDMATH MTEXT MI MIB MN MO LIMITS NOLIMITS SUP SUB MROWOPEN MROWCLOSE MATHOPEN MATHCLOSE MATHORD MATHPUNCT VCENTER LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL BIGM BBIGM BIGGM BBIGGM FRAC TFRAC DFRAC CFRAC GENFRAC OPERATORNAME MATHOP MATHBIN MATHREL MATHINNER MOP MOL MOLL MOF MOR PERIODDELIM COMMADELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT OF LEFTROOT UPROOT BINOM TBINOM BRACE BRACK CHOOSE DBINOM UNDER BUILDREL OVER OVERBRACE OVERBRACKET UNDERLINE UNDERBRACE UNDERBRACKET UNDEROVER TENSOR MULTI ALIGNATVALUE ARRAYALIGN COLUMNALIGN ARRAY SPACECUBE HSPACE MOVELEFT MOVERIGHT RAISE LOWER PXSTRING COLSEP COLSEPSPACE ROWSEP NEWLINE ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS SANS TT ENCLOSE ENCLOSENOTATION ENCLOSEATTR ENCLOSETEXT BOLD BOXED FBOX HBOX MBOX BCANCELED XCANCELED CANCELEDTO NOT SLASHED PMB SCR RM BB ST END BBLOWERCHAR BBUPPERCHAR BBDIGIT CALCHAR FRAKCHAR CAL FRAK CLAP LLAP RLAP ROWOPTS TEXTSIZE OLDSTYLE SCSTY SCSIZE SCSCSIZE TINY TTINY SMALL NORMALSIZE LARGE LLARGE LLLARGE HUGE HHUGE DISPLAY TEXTSTY TEXTBOX TEXTSTRING COLORSTRING STYLESTRING VERBBOX VERBSTRING ACUTE GRAVE BREVE MATHRING XMLSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE ENSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE NEGMEDSPACE NEGTHICKSPACE STRUT MATHSTRUT SMASH PHANTOM HPHANTOM VPHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOOLTIP TOGGLE TOGGLESTART TOGGLEEND FGHIGHLIGHT BGHIGHLIGHT COLORBOX SPACE NUMBER INTONE INTTWO INTTHREE OVERLEFTARROW OVERLEFTRIGHTARROW OVERRIGHTARROW UNDERLEFTARROW UNDERLEFTRIGHTARROW UNDERRIGHTARROW BAR WIDEBAR SKEW VEC WIDEVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT DDDOT DDDDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV EQUATION EQUATION_STAR EQALIGN EQALIGNNO MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SUBARRAY SVG ENDSVG SMALLMATRIX CASES ALIGNED ALIGNENV ALIGNENV_STAR ALIGNAT ALIGNAT_STAR ALIGNEDAT GATHERED EQNARRAY EQNARRAY_STAR MULTLINE MULTLINE_STAR GATHER_STAR GATHER SUBSTACK SIDESET BMOD PMOD POD RMCHAR SCRCHAR PMBCHAR COLOR BGCOLOR LABEL TAG BBOX XARROW OPTARGOPEN OPTARGCLOSE MTEXNUM RAISEBOX NEG LATEXSYMBOL TEXSYMBOL VARINJLIM VARLIMINF VARLIMSUP VARPROJLIM
 
 %%
 
@@ -781,6 +781,8 @@ closedTerm: array
 | statusline
 | tooltip
 | toggle
+| label
+| tag
 | fghighlight
 | bghighlight
 | colorbox
@@ -1134,6 +1136,18 @@ space: SPACE ST INTONE END ST INTTWO END ST INTTHREE END {
   mtex2MML_free_string($9);
 };
 
+/* TODO: intentional no op -- figure this out */
+label: LABEL ATTRLIST {
+  $$ = mtex2MML_copy_string("");
+  mtex2MML_free_string($2);
+};
+
+/* TODO: intentional no op -- figure this out */
+tag: TAG ATTRLIST {
+  $$ = mtex2MML_copy_string("");
+  mtex2MML_free_string($2);
+};
+
 statusline: STATLINE TEXTSTRING closedTerm {
   char * s1 = mtex2MML_copy3("<maction actiontype=\"statusline\">", $3, "<mtext>");
   $$ = mtex2MML_copy3(s1, $2, "</mtext></maction>");

data/ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_label.html

@@ -0,0 +1,3 @@
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow><msubsup><mo lspace="0em" rspace="thinmathspace">ta</mo> <mi>&alpha;</mi> <mo>&dagger;</mo></msubsup><mo stretchy="false">&vert;</mo><mn>0</mn><mo stretchy="false">&rangle;</mo><mo>&equiv;</mo><mo stretchy="false">&vert;</mo><mi>&alpha;</mi><mo stretchy="false">&rangle;</mo></mrow><annotation encoding='application/x-tex'>
+\ta_\alpha^{\dagger}|0\rangle \equiv  |\alpha\rangle  \label{eq:2&#x2d;1a}
+</annotation></semantics></math>

data/ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_label.txt

@@ -0,0 +1,3 @@
+$$
+\ta_\alpha^{\dagger}|0\rangle \equiv  |\alpha\rangle  \label{eq:2-1a}
+$$

data/ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_tag.html

@@ -0,0 +1,3 @@
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow><msubsup><mo lspace="0em" rspace="thinmathspace">ta</mo> <mi>&alpha;</mi> <mo>&dagger;</mo></msubsup><mo stretchy="false">&vert;</mo><mn>0</mn><mo stretchy="false">&rangle;</mo><mo>&equiv;</mo><mo stretchy="false">&vert;</mo><mi>&alpha;</mi><mo stretchy="false">&rangle;</mo></mrow><annotation encoding='application/x-tex'>
+\ta_\alpha^{\dagger}|0\rangle \equiv  |\alpha\rangle  \tag{eq:2&#x2d;1a}
+</annotation></semantics></math>

data/ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_tag.txt

@@ -0,0 +1,3 @@
+$$
+\ta_\alpha^{\dagger}|0\rangle \equiv  |\alpha\rangle  \tag{eq:2-1a}
+$$

data/ext/mathematical/mtex2MML/tests/numbered_equations.c

@@ -72,3 +72,21 @@ void test_numbered_equations__multiple_notag_nonumber(void)
 
   cl_assert_equal_s(fixture_mml, result);
 }
+
+void test_numbered_equations__skip_label(void)
+{
+  fixture_tex = read_fixture_tex("numbered_equations/skip_label.txt");
+  fixture_mml = read_fixture_mml("numbered_equations/skip_label.html");
+  result = mtex2MML_global_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT, 1);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_numbered_equations__skip_tag(void)
+{
+  fixture_tex = read_fixture_tex("numbered_equations/skip_tag.txt");
+  fixture_mml = read_fixture_mml("numbered_equations/skip_tag.html");
+  result = mtex2MML_global_parse(fixture_tex, strlen(fixture_tex), MTEX2MML_DELIMITER_DEFAULT, 1);
+
+  cl_assert_equal_s(fixture_mml, result);
+}

data/lib/mathematical/version.rb

@@ -1,3 +1,3 @@
 class Mathematical
-  VERSION = '1.6.4'.freeze
+  VERSION = '1.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathematical
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -1488,6 +1488,10 @@ files:
 - ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/single_nonumber.txt
 - ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/single_notag.html
 - ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/single_notag.txt
+- ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_label.html
+- ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_label.txt
+- ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_tag.html
+- ext/mathematical/mtex2MML/tests/fixtures/numbered_equations/skip_tag.txt
 - ext/mathematical/mtex2MML/tests/fixtures/performance/big_file.html
 - ext/mathematical/mtex2MML/tests/fixtures/performance/big_file.txt
 - ext/mathematical/mtex2MML/tests/fixtures/symbols/gt.html