diff options
author | Karl Berry <karl@freefriends.org> | 2023-08-25 22:43:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-08-25 22:43:13 +0000 |
commit | 15978e6af4b80b7aa09b0587102357461927260e (patch) | |
tree | 84cba9e2e3b3caf691ef9de274ce3a2aadcfe145 | |
parent | 758081ab5b1faed25af4aa18aeb1d4d9f51416d1 (diff) |
antique-spanish-units (26aug23)
git-svn-id: svn://tug.org/texlive/trunk@68055 c570f23f-e606-0410-a88d-b1316a301751
3 files changed, 100 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/generic/antique-spanish-units/README b/Master/texmf-dist/doc/generic/antique-spanish-units/README index 881f8e31bb8..2d2caf1fb5a 100644 --- a/Master/texmf-dist/doc/generic/antique-spanish-units/README +++ b/Master/texmf-dist/doc/generic/antique-spanish-units/README @@ -4,7 +4,7 @@ This short document is about antique spanish units used in Spain and their colon The document is provided "as is", with no warranties, and is distributed under Creative Commons Attribution 4.0 International License. -Current version: 1.2 (2023-08-23) +Current version: 1.3 (2023-08-24) This "package" is maintained by Noel Merino Hernández @@ -14,3 +14,4 @@ History versions: 1.1: Initial release (2023-06-07) 1.2: Some improvements in tables (2023-08-23) +1.3: Added units and subunits in tables (2023-08-24) diff --git a/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.pdf b/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.pdf index 08c7ddd6c18..d3789293511 100644 --- a/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.pdf +++ b/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.pdf @@ -205,7 +205,7 @@ stream </dc:rights> <dc:date> <rdf:Seq> - <rdf:li>2023-08-23T01:12:27-06:00</rdf:li> + <rdf:li>2023-08-24T20:51:23-06:00</rdf:li> </rdf:Seq> </dc:date> <dc:type> @@ -219,12 +219,12 @@ stream <rdf:li>es</rdf:li> </rdf:Bag> </dc:language> - <xmp:CreateDate>2023-08-23T01:12:27-06:00</xmp:CreateDate> - <xmp:ModifyDate>2023-08-23T01:12:27-06:00</xmp:ModifyDate> - <xmp:MetadataDate>2023-08-23T01:12:27-06:00</xmp:MetadataDate> + <xmp:CreateDate>2023-08-24T20:51:23-06:00</xmp:CreateDate> + <xmp:ModifyDate>2023-08-24T20:51:23-06:00</xmp:ModifyDate> + <xmp:MetadataDate>2023-08-24T20:51:23-06:00</xmp:MetadataDate> <xmp:CreatorTool>Noel Merino Hernández (muxkernel@gmail.com)</xmp:CreatorTool> <xmpMM:DocumentID>uuid:f2000a3e-fd13-4954-846c-95fd1d7f754c</xmpMM:DocumentID> - <xmpMM:InstanceID>uuid:00546c41-d133-49b1-8d1d-75f26c4c9b6c</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:0a39546c-4c41-4dce-81dc-ef2b67a3959b</xmpMM:InstanceID> <xmpMM:VersionID>1</xmpMM:VersionID> <xmpMM:RenditionClass>default</xmpMM:RenditionClass> <prism:complianceProfile>three</prism:complianceProfile> @@ -271,82 +271,75 @@ endstream endobj 15 0 obj << -/Length 5298 +/Length 5303 /Filter /FlateDecode >> stream -x=K&In}e^OZ9ڦ[x)#3wwԩS! -<y; {p_ocxw?|0W/OӒl}lx+0U@~!s
Hn֎l}á17øFq-ޅ(x'x$ⳕp -"aX~4TQ0߭Nv1Q#/^kp̰f@q[\xQ"F˨a=GTɍ',\]@-fGd8N<KÓsh a0͘6SКKԄgZl -#i`YcYDyjCl³ʊZp2 -$c|u8Aj/s:\"tyaGj>j,1Q
q;4F9sŠ3WRd_+psiO -X*r0а5aD8&,0Ӓ2Gm㒒"hu -2P^jH(u
y@ԪC{X%ߚ*N|L -&APD|j61%\JܣbH:H&dr|zoZ\YUbvMSbAt-P"' "ѡc v5Ԏii./%e.T1x9D,<R0&%)$dvOfك.RsqJRM8NG6GС-VoOi{V{Ȃ)^z|.
"ujw_cg6j4uƏfǹ T|^XNTIütF_ȥ@@rSG6ƫ#_o;I/@!0﵆8Y"!jU̜l%mf0E8} -Є9gɰpg-u_Y39J
g%C=+6QM:Yi$rr+D-&z@ȕGc. -95FB\8@:wǼE*c6F] -ensswV QcUB0%y(ru>,MsfK$J*8gDJNfvf(XMuVn0e{H9:.$MmOZk6X9acII<C;Z!~m;[EC-"tfn:dTad#Վl:t=)ǫf8CMn:ܑDW@fl$դ~zZB:j.P\{>6G?[r
rMskH3<GYj<Hɿ۬_(vy3'b!_X3=\Ow"YE秹#ZRTY|әB7;F^,9LR?
Ώs\JalS-7C]%t_ro}I9i&}QʹƌyztUtL|nRtI49 -\$[,qri-d -ymMUUrl>?oڲS'!{<Mgx!95֛Ρ
Rz/:/TH䄧~< !uNdU҃#;N]csw^OPK(ح_(;`&3睁45n
06N?H{Hu"6lX|PtC8oRzkϲP.d[='gF-PX?wB筌RN =snBۣg 㛷 ۹hɱn~8u$\#VEr G*Hxܯ%\-a.o+N5.V''"Ewrr4jwL'{*p>bӳhPӊ+[*{"OlRi$zpf=r;8@1ܑ4qF1qvx
&qK\<fϊ;1)dM4geD7N&r~-sP?M"nD\pwҝ$$qk0 #cgOv1hJ`~:rb[zOF)sXc5eۨmա#s4W#g3 9'
V3Ɲe?*x{!dw̕P.
o\u9D59r&P. - G71.uc6Xq=pq(/i#":i!Pp+/|O5ʙN
*B(rE'uo
4mϹgx.tnb(`HޖznQtp,B*aATHOyiaR:B"8G1!ʻ -6(xF) -ad/r2oе0_mB_d Y^ղ3(
ok|QqׯBy_%OJθmXf4A@3oޮû~wۻ\ݏ7/_r>S|?)_lÿwfx%fv@Oۮc/yr| XŬm_U-?/~Pބº^iʣ%Ie0x6L7zx_aHhӈ)x -(wȰBVT X:jQL^9B^r +x=K&9r}KKƗ{7
ZCs0,M_w/TfN;3x=߿3ʿ ">YOO>yӇקyok_}mYz}0-ƷO^{|ƿ}*t{p yD/x$kcψ1Paq̘7øFq-ޅ( x$ⳕpn +tqBؠ0#cTZ6d%EW4<oh!f
Bz
-M;d~2pcظzzɎk5jb3Ǒo v|mOWEyb( qPN"'4Xg<Sgx\o배FьIKa9)mLMjpŦ0iZ^%OY<a7NULT&I:${Vk&k(E +|svJcF-s6.))B&\\ +ĂZ>qEN@l;ECxv<MLsp|.)st)6[9V%-dR鞨理rr#7FO
0t"(3SjtEj^B&wzyK˅#C?N"+siS;U +c^B*c6F] + A99;(1`*%%|Vڒ<ru}X4ͶITpD=R"I8>P1؛V[8!輻ljxz(U_
HRLNкa(C9ʿgn.(6"BaCAȟ#;^Ivy?H{tJ]64tItoYK-" +ZE1*Ws_9Jْmk[CedGJbG7s<,!uP5Cht'%_:4u|BK*1ђs:{fg?8E5IJGq@i M?ur +HeLNx*orRNtuA8u]9zI>}CQ^.`~e+@~wusoI8 \r 9։jn<gў~fy[{rgt!&6<95zoºRxqؿ]01p<)aڼg\Ys{tL;m&n֪b{Np!&6Eh'9?bFkX)=$td#pUrdr8懹\Ը;qzw:G[䒋ˁ1H;<ZNLϢBN+na0DF*>urҤH~pf=r;8@1#ibCOL21fy̞ןwbRɚiJD7N&r~-:~D.uIi2r;I41 +;I6a@2g0Β]1z!3%btEcmtĶ.B<)cikʊQ'mա#s4W#g3 9'
V3Ɲe\?*x{!dw̕P.
o\u9D59r&P. + 9͋.uS%7.7ݍ;"ٺjg1 qPݟ?9-dC^J3N\n@T\SI Ѡ*̀R o\=Y|ޯ{k,en?3x.tP(-9-/>yGT
R=,>a3v祅KKܷ>9 Y~<+WTFwux%7/Qʥy揊">~t|\o6Zm]_xhʕoo4YI[1Cr?TTc$SL˪q:O$ăr6/h_mgPoLY=Eh^7zbsYW]
j)/dȆj +ۻ#ѹO_'W U#2~1__W9UJqmywVC.
&Fs4H?xH#
[TOKsEʃgƊ+Z{a\LvZnov?~1'mZMd: >Zik5
O|$,4oח@tFڒw$yg8)fۄQj[@rRghkJj2\bzT +6q(8FkפgV_@-z*!ܹ)Y[HN}R6܌ָV6ޡISt@+g9p?~x?ڔT)B'?x+E~onY_˻}^yٲ]~,P~-kmk0''EndmJ*l`}iۇ+UuOm(OH
y=匨=4IHCb%!abfn$ok3h0a܀ endstream endobj 44 0 obj << -/Length 3036 +/Length 3197 /Filter /FlateDecode >> stream -x\o$9_1C4v? 儈=xEB"v=3ݶvO&٬HzՇ[ӻ旿v(rZEwI[wVNag"M&-6)
;:_MR@Ӓ_4a^hAVQʞW.dQ~uX)'kr~{͔iRr.KdPYc*#VrQmba!&d@Юg2֙g -&a<HGB-Nw6퇿N:N_
[L#i|ǹ@c&5Km[ -W C7i?zgf/XV@qӴRioѷ}
;̱x̟f^I 䚺 -|G5tMz-Vg_VaPd[&4o!g܁泙3e<6I*,lk[$sĊ䥳?M24bbn`KF0;esGm8lв!b;t@iJLʠO^suIU6p)FSؤ|6FI'dhK<_)6r*2o<>(*J yjm -ƱhB֑,I uV2BpBY:g۩;J,b\g21ˡ+ZM
qy}Sᓈ ]' -u?s3#4?.SM]#9G~c-Dal~+fiH*r@G_{k">7P̃hE6 -wx'F}o+s']%r\e? -G7،/VֱU\@$edEC'm҆MRfg -;Yp])CkTM
rE~)+q?s.>%2NRejR>p!p$c:ysαc:Lg -[*q,<y3&`Lq@6*@zcQZn;7{m:_mQz3TrRiSNuMK[iǖV//Ԡ>mw-"Y? ^jmL.ct[PӐaJ5)Oe=[8$b?/{~Ve2J/Р}N8'KOΰudAhtU@P*C ]X+-f_c -ՙÓrѫgC*$_UR@5_/$&kmM%Jloee%g영Q픝#3xǖ6}?\ܾĪ<ǟ䛛fPJDٶQYC# -oMaO?3~%|')`
|OliElΰr[Z$tTDXPZ)4ex$zKOxAZEE^F3TGv٫DT>4v.8C.̇hi_աui^:|z{3IK;K]&Wy\CWiIشO -]A# WQsh-d
x{JNr)XAv+!xl`5O舕(5'1̄p갋lMNKt-;cPy=+]6qg{ʈX{6LZn}*V9 -&ɗ/3qH1M=5^yqkdzj֭^J%=b氺@kj.)rK9;(k\ėKN>K.ʫX~%ϐۢB4ǰTo( @;<> n+]Q5u\ -ED/\<#%Vq -tعc
SErtB^<ZI],;R_F &lKDXL8pFnr2mg?^p?n-V$ޏȂKŘJKΏ6)NxFZ-V5@DN-Tm~<$f/W0B*Z;*f)oH;U(2np+T +x\Ko$W>H! +<Jq{/b&-6*;C:syտBNK~Ӥ*fh&pBTNʟ=|~=GgϔjR +%M2\7nXXȦI,(,=FNϟiWL3@0#[H4SWA=ӢȴQGO@cO&5Km[hEDCDmC7i?zg^@7ͷ#ߗ;0/ʟvKc?o>}
;Gf괛fܒ>Uu^kymv^77o@Kacvh>YlFQQYqx>:ۅon@5 bx'F8DTo.Ѳt#sGm&r%bCt@` 1?1ÙA +2i7W(eG?W~9dE3!!UUĒ|Q9%D#q'}mfmZqWBA]$kمiwҳx'<V>?ģ`sUp)9:[kz_[iONU+"Qa} +:Yp=+=
(RS$ƨ(/ +Z[)ڗ\!%^D{ZԂ:A<ɸ*mq8|v>G>(m⚪^KqL3t7* A@# hJŽTo0*gb^B2,tMܔyoqj&Gr͔ꚰ}*ya`kJ}M'D>9'S-On +^aC<-JOϗ[3!䳻]ʔ+H(%zhnMicBSb1V +-XZ2 0"oFl*P}bCӆ^M9<R>zl{La*Ѿfomj=y1k0`̸-m~[qU77G>yjʟ䫛^L$ٶIqE0P-q21kVY +ʃ]M +b>-\ endstream endobj 48 0 obj << -/Length 2525 +/Length 2336 /Filter /FlateDecode >> stream -x[Kd7YLG*KlZHR6HLgABoVս>3lfJ3.?;w;wFd z -O±eqXƨJ]LavN{H>m%)I&~_VE\I]+ -|k%8AYz(wJwqQWU9{ْY3X\%P&./J³ -exPDճFh@MJiSacKOv8d{QL?J^ЂRUlXodq[uNs0'oxڵb/% -t9-j3lh]E(K.-HIAc}Ez -Fn@J@r@68ޤuÎd -ߚr &>8qvߣ*=w:r(s"<hFbD^ב~j.kzh%|k ;HjWں.l29oN),A5m2vD\m܈f͂>P ޮyQ@jͽK*V{6KjjJB'm_#oy0#:w*wCp/AqKͪ
2M`C?-%יcƾ?2O<h+Xvk( gܾ^|OR3- I7+Z)HXZ}q-Ο.%t (2HfEV$VH' mi4, +x[n$+ +Nǖۍ06`Cd%@cY]YQUEK,/L?|pSe8<}H"ix,w?|SFztpȨsuLC8;KtӐGb8(:y;$8A3#I?{"{d=Cӈ#yCyv +$t8!i}@KwX< +dG +$lX\l1-[U}_i/pVR$*f$$E*$<hG(w`Uy<٧нMt 6VX!G?-폿hf -ؤF"MSkfb\UXg36uАlbMһ"AY'OʖH̸~k>88]C{M>'6M=<(弇([hיW>y6yKjQi?Ϯl~h.Uaؾ/t:Pf2kz@,tOsZbƼvx= +-a] -H9Εꋻᚊ/"]:S"<*߂\0<:(Jzy6v1 +SgLJ`ϓ +EI)p R`0vkf0OeIŎ۵&/Tһ(^+{ƥŝrr5*h]M0iK.OS>AC
b`[oX^l#[hdGMEt(2K͌;(.A5'd ZWD8Zgb:~,hGj|F)3^20z%1u5EBgؔP1f$;aMAArRmO Q7jy?U8I*=g'^DIF
+g +^v>d W[hr]Lu֯&W8F (xjfy^S_A0QYwFqO՝H!'ˣd8,M +)LPT֖*a*Exn2f>k75bͼצFt`jiͪZ2Z6-$qq1`K=ZORYs)Fy-L-qrJqYԏ¿řGS>;8>!Z; endstream endobj 52 0 obj << -/Length 1502 +/Length 2012 /Filter /FlateDecode >> stream -xYKoEi^!KX!0p!.ofw$kU}e?2g_b -"8w)!<onWW0
]&a -K -&KXFj^s9AdB+6 -Fb3=xW|߁/k5]]my{82xF&ڪݡGU(FhM=okBb}FPQmYz%OMN-xL%` HäLlvj0ƺ-v1=0#vIU H~PXGӂ) -{=Ƕ=*9|;"ϋk}e]⥼40`LF⥻h짥R
ZOo8Mn,&j6t_sSz^orUG<"Bf犼m.~ͨ7&P3A>o]]\D('8Zg<YQ|q̲|Vâ3:g*LN2.6h:xQKtNa{*Yw\zpp7&/9`t/|6lv3
eM<辉&NkJrƭ5{㜠>F"~vv9"OhY;蟯9G vBwk]?Y!mV -`>ʛQA=KJ̅BiDžACݸ&[I]^u5:#Zsɋ)>,^W5Nomq%D>1ASS %gh {&Cw(lL\#V}O,-$JAVFop}q20[g -g53?` +xZˎ%5WԽBJx8lk6h$@b%XP,` +fbf3,>ҙבVtmSݾxwoygp9wIO_n<(P9">85EeG^NG>jJY<=3(O yZqCS'}peSRp8oa +KN|#S&=p({<r\wLZqoP.,O\TahrZ6!y]
ږ|Y]I3_}qo>3 +x-~{=}yG9u'Xk龾ekفNH5K͏,C)qΖ?xdh +&h7Kc TL34QlTPnޘ]di%Z/7}ъN"aMP G
qv=}3 M@v+ɾPuBJq3qX ٖeLP0p @.h: x +q xsniʌ:7Tm +lӞBv$akD +k</lm]UGpr% endstream endobj 73 0 obj @@ -1120,8 +1113,8 @@ endobj 87 0 obj << /Title(El antiguo sistema de unidades espaolas)/Subject(Metrologa)/Creator(Noel Merino Hernndez \(muxkernel@gmail.com\))/Producer(pdfTeX 3.14159265-2.6-1.40.21 \(TeX Live 2020/Debian\)) -/CreationDate (D:20230823011227-06'00') -/ModDate (D:20230823011227-06'00') +/CreationDate (D:20230824205123-06'00') +/ModDate (D:20230824205123-06'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.21 (TeX Live 2020/Debian) kpathsea version 6.3.2) >> @@ -1131,32 +1124,22 @@ endobj /Type /ObjStm /N 76 /First 616 -/Length 4766 +/Length 4768 /Filter /FlateDecode >> stream -x[Y}GϗRJvbٲ%;vTzg(EιL*h,
\tTe++Wl*_YP9XTE\%o*?f5JJۘ+Kg4G.XU+_9\FA+T,ɣSƔ6VҨ++CldT@7-wh)TҸ*o+㣙9U1?ϕG9*[y<cy/)TU -;n
JWC[f*8BB!*2t`*{,"*G2&pPZШqefX8X3@cVxH;p -gSMdLif0`\K,ll"]M#6%S"q1Y2S8>K1lbMk@˸7}PmfsU?/67UzawWeyV?vYOf_;͎ns=_URdyZ<ؼ^(Ty9 -mc*w
IA. -*amQr`2%%cx_;EJ:']c.AڍhÝ%I}h -{q2XI"EܣFuPEnzc_ۊUEH`Kqr=ͷ|t -F?Po01ѮZ -<~A|xTxPiL+ 5A֙]hҞp1UG%< -uyɠliV7E%7<V8"1Gҁ^lj4Nȩv4A\3$xDo$I=Sr'ME8˵Q%J21yu/\CхD3s.M4H!815Y$e6ɢ&33M$,Q銑xs4eR0;*NÄar0 -D+<3[Ox5L!qPTL]1r>6% -O([ -r5LjRrאz9t' -3TO)SJ#@chg+kmCI2ka -F<'R<Ry"78'-с -%wPڛ EU1q
Zʗo4gWFU!^Y#&'Lȸ+`e,OC$Eqy-J:beN@2@T>jb`NT-C8K:s1@WTqЌ0OYx( ޱ|FUWKp2e#\Z!5ĦF(:9XmGk -ZA##r~Q|Lz$/24!#[Y#Rɓ4*uN騬Z6c.T)"⳨8=
73J0>j,sk!EkM%uւ0&rO'nW`N,"tQ4e\{K8|%F>l Je~],5QZ nzN ڨExGGN*ۣqc4٘hVI^4Z+} -1<$jroZWh?30y\Ў=2ܛҟu>M<{ldOSNKx0rA˞E^ʱq&XD,%d!T2{P\[XSK-$ŁS=$e)<q%K%o*^%-l{ Op?6I/$Hy -r9 VPaջQ-}9x8gX~-ϴY\d^mO{6px\@~h<Ъn;Sì~xr͞69!Ԭj\_\l;EŖ>Z_>/eu>+t=^aho[Oϟ>~`ܯkb,bc{q{ڴޯtk]ů_fojs!GOw?8b{=r.X=B0.蛄 &<֏`_oooCA#|w^/JbvֿWWWJoϡ˦r_\],voWջ4jsjg8߃5ySr
iX^ _|U_1[kV/jtKE7Sˋ6(z#Yj4___-2f8f247} -;hvwX&(nRN[g+Fl?H{Kqt7LP~rٓH5).|Wc}هv##ۍv={ɇjqqjD-wڮv -J`@S>\j3^ZByvs2|6άaa<WҊUd#D-VLfycƽzQ -*2 -*LGClJS>cBS8-Ii$9;hLKR$lDOԉMۄtJM+;Щ.}]mRw\ Fcϱ@Nl-Ɣ%uHِ4:ScxN30^N)3_iZ[]o\!˻䝏f
=?{9l+;~cK=eso^=7}ٝ[U)ǰͬ~2azϺa~XJlVaE8wN7`VaE>>>~<;u:~*
%{qC@)݇l7gEUoI˚Rl{X?^/OĔ^߾]
n', +x[ْDZ}W:}p8(%Jd>@3 kM9Y.[S]KWer2+UU:Wָ*T·*V>*UѨ*WɛJ&aƟ3bCm̕ƭ3i,U+_9FI+T,cSƒh6VҨ++ClbTTn0qh2b?xG;s2?Uyԣ(3XB\@+tVnAs -$T_?]`<nE T:)0P)3i84cRR2vn7^a +xְ5>&7[E8MtivElؕ>JN)i0ƀg|,,qǴ-Ez\Ƴg +h3iUys/ݳ7˪~x7ri?,wrGˋ]\!Ę͋&I+* +Q'VХ)2~z^ֿ߬{r+s-~8gt'GS5ݭ&Lbr9gЭҐ\s
49̽'h0OCH]2:ͳ!Mfr>A};1Jy
ipjhʉ67*>
C({Ms Ӡ5pz0Mnnu8ACu4FҐFxt$iR%
HRg?wƝ!i_5OYs@|q|dT22 +{(*dB9"ED;͢Hs>s28"8^X +Zl+D`fFhoG3z8Csxz:6[#lqva3D e␙#,#g^]?]{јT/X^J6̇tnӎn:fMq@_<SҖOsj`a,4RRcCukH(4mc.wȆdܠ ++!D(G09<կ)"%qQ1rZ Faf=AR#m + ̩d
,ZHzH
SNx\/.f5(KJ@UKKZl<F'p?6^ I> +]W.mgO>70tYe5yoN6~cqw^er\pɣ|Ӏ?,_]_.7*ܳ!<#.3I1`½~~XL0I=4iZw.v{h[+xܬj^p*E-shni-Werv)R~ʿi<f8߃y]~r
iX_ _~U_Xk)V_,כz閆n
\WmY6Ff-|}}|tlD>//n+lt_;-bo@wSpa4`_9v,G)-h!_6|r4u}MJ3oY{Wc}ȿnOOz~Z\|v5;˷pd~`iȠo4䆶'Д|sZ/P~G\6*3kxAX=8d}:bb +k]`Б|d +*LGClJS§Su<ϘNo@}Ih26|<Fc$Ӓ03>)QӉ:M(Kt7ѥoAn_.uK`44Dj1,Cʆי~sQvJ9߾5bƥ5D~L0;Oy/`NROAݜ7}ݞ7}ݝ7R-%?aUoVWdºf{
@PbðU6w;[tIL +5lggn"T>OgCɞb1JGtiլJ[Ҳh?o.wKBrӀ27ݒv endstream endobj 88 0 obj @@ -1167,16 +1150,14 @@ endobj /W [1 3 1] /Root 86 0 R /Info 87 0 R -/ID [<FBE69B7F1C80BA16472F9493EA186BDF> <FBE69B7F1C80BA16472F9493EA186BDF>] -/Length 216 +/ID [<2D4BB66CB67C4A5EBB27AEF65BCEBC8F> <2D4BB66CB67C4A5EBB27AEF65BCEBC8F>] +/Length 218 /Filter /FlateDecode >> stream -xINA@U@DAQpAa͖ĵ "KF|RI+)?'DL(*u ۳Mn*BnBQlC -ҰqP2P, UY. -pE(A*pU>:U-XZ[.^
ךe hM +xINBQF|* 7`
bdhʘK`#.c7"HS/'JJdQ[A``FL٘\5ΠpwpUKH=L$`f! endstream endobj startxref -221138 +221627 %%EOF diff --git a/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.tex b/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.tex index dbf0690d124..77c9c42e5fa 100644 --- a/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.tex +++ b/Master/texmf-dist/doc/generic/antique-spanish-units/antique-spanish-units.tex @@ -35,9 +35,14 @@ % TABLAS \usepackage{etoolbox} +\usepackage{multirow} \usepackage{booktabs} \usepackage[toc,enum,lineno]{tabfigures} +% MACROTIPOGRAFÍA + +%\usepackage{showframe} + % ENLACES DINÁMICOS \usepackage[hyperindex=true,final=true,bookmarks=true,bookmarksnumbered=true, @@ -51,8 +56,8 @@ linkcolor=black,urlcolor=black,pdftitle={El antiguo sistema de unidades español pdfcopyright={Este documento se distribuye bajo una licencia Creative Commons Atribución 4.0 Internacional (cc by 4.0). Por lo tanto, eres libre de compartir, copiar y redistribuir el material en cualquier medio o formato. Adaptar, remezclar, transformar y construir a partir del material para cualquier propósito, incluso comercialmente. El licenciante no puede revocar estas libertades en tanto usted siga los términos de la licencia, bajo los siguientes términos: Atribución. Usted debe dar crédito de manera adecuada, brindar un enlace a la licencia, e indicar si se han realizado cambios. Puede hacerlo en cualquier forma razonable, pero no de forma tal que sugiera que usted o su uso tienen el apoyo del licenciante. No hay restricciones adicionales. No puede aplicar términos legales ni medidas tecnológicas que restrinjan legalmente a otras a hacer cualquier uso permitido por la licencia. Avisos: Usted no tiene que cumplir con la licencia para elementos del material en el dominio público o cuando su uso esté permitido por una excepción o limitación aplicable. No se dan garantías. La licencia podría no darle todos los permisos que necesita para el uso que tenga previsto. Por ejemplo, otros derechos como publicidad, privacidad, o derechos morales pueden limitar la forma en que utilice el material.}, pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es} } -\def\fileversion{1.2} -\def\filedate{(2023-08-23)} +\def\fileversion{1.3} +\def\filedate{(2023-08-24)} \title{El antiguo sistema de unidades españolas\footnote{versión\space\fileversion\space\filedate}} \author{Noel Merino Hernández} \spanishdatedel @@ -70,8 +75,10 @@ pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es} \fancyhead[CE,CO]{\scshape\small el antiguo sistema de unidades españolas} \fancyhead[LE,RO]{\thepage} \renewcommand{\headrulewidth}{0.4pt} -\renewcommand{\listtablename}{Índice de cuadros} +\microtypesetup{protrusion=false} +\renewcommand{\listtablename}{Índice de cuadros} \listoftables +\microtypesetup{protrusion=true} % CUADRO (UNIDADES DE LONGITUD) \renewcommand{\tablename}{Cuadro} \begin{table}[h]\label{tab:longitud} @@ -79,6 +86,8 @@ pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es} \caption[Unidades de longitud]{Unidades de longitud (pág. 50)} \begin{tabular}{@{}lclllrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{7}{c}{Subunidades} \\ +\cmidrule{2-8} {} & medias & tercias & cuartas & sesmas & pulgadas & líneas & puntos \\ \midrule Vara & \texttlf{2} & \texttlf{3} & \texttlf{4} & \texttlf{6} & \texttlf{36} & \texttlf{432} & \texttlf{5184} \\ @@ -93,11 +102,14 @@ Punto & {} & {} & {} & {} & {} & {} & \texttlf{1} \\ \end{tabular} \end{table} % CUADRO (UNIDADES AGRARIAS) +% Here siunitx package do not help because we are using common fractions. Dirty hack, use phantom. \begin{table}[h]\label{tab:agrarias} \centering \caption[Unidades agrarias]{Unidades agrarias (pág. 55)} \begin{tabular}{@{}lrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{3}{c}{Subunidades} \\ +\cmidrule{2-4} {} & largo (varas) & ancho (varas) & área (varas\textsuperscript{\figureversion{lf}2}) \\ \midrule Sitio de ganado mayor & \texttlf{5000}\phantom{00} & \texttlf{5000}\phantom{00} & \texttlf{25000000}\phantom{00} \\ @@ -119,6 +131,8 @@ Fundo legal para pueblos & \texttlf{1200}\phantom{00} & \texttlf{1200}\phantom{0 \caption[Unidades para áridos]{Unidades para áridos (pág. 59)} \begin{tabular}{@{}lcccrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\ +\cmidrule{2-6} {} & fanegas & medias & cuartillas & almudes & cuartillos \\ \midrule Carga & \texttlf{2} & \texttlf{4} & \texttlf{8} & \texttlf{24} & \texttlf{96} \\ @@ -136,6 +150,8 @@ Cuartillo & {} & {} & {} & {} & \texttlf{1} \\ \caption[Unidades para líquidos]{Unidades para líquidos (pág. 62)} \begin{tabular}{@{}lcrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{4}{c}{Subunidades} \\ +\cmidrule{2-5} {} & barriles & jarras & cuartillos & medios \\ \midrule Pipa & \texttlf{9} & \texttlf{82} & \texttlf{1458} & \texttlf{2916} \\ @@ -152,6 +168,8 @@ Medio & {} & {} & {} & \texttlf{1} \\ \caption[Unidades hidráulicas]{Unidades hidráulicas (pág. 63)} \begin{tabular}{@{}lrrrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\ +\cmidrule{2-6} {} & surcos & naranjas & reales & dedos & pajas \\ \midrule Buey & \texttlf{48} & \texttlf{144} & \texttlf{1152} & \texttlf{2304} & \texttlf{20736} \\ @@ -169,6 +187,8 @@ Paja & {} & {} & {} & {} & \texttlf{1} \\ \caption[Unidades de peso]{Unidades de peso (pág. 66)} \begin{tabular}{@{}lcrrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\ +\cmidrule{2-6} {} & arrobas & libras & onzas & adarmes & granos \\ \midrule Quintal & \texttlf{4} & \texttlf{100} & \texttlf{1600} & \texttlf{25600} & \texttlf{921600} \\ @@ -181,12 +201,13 @@ Grano & {} & {} & {} & {} & \texttlf{1} \\ \end{tabular} \end{table} % CUADRO (UNIDADES PARA EL ORO) -% Tables are ``faulty''. We need ``improvement'' these tables. Then we need designed them. \begin{table}[h]\label{tab:oro} \centering \caption[Unidades para el oro (Au)]{Unidades para el oro (pág. 68)} \begin{tabular}{@{}lccrrr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\ +\cmidrule{2-6} {} & libras & marcos & castellanos & tomines & granos \\ \midrule Libra & \texttlf{1} & \texttlf{2} & {} & {} & {} \\ @@ -203,6 +224,8 @@ Grano & {} & {} & {} & {} & \texttlf{1} \\ \caption[Unidades para la plata (Ag)]{Unidades para la plata (pág. 68)} \begin{tabular}{@{}lcccccr@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{6}{c}{Subunidades} \\ +\cmidrule{2-7} {} & libras & marcos & onzas & ochavas & tomines & granos \\ \midrule Libra & \texttlf{1} & \texttlf{2} & {} & {} & {} & {} \\ @@ -220,6 +243,8 @@ Grano & {} & {} & {} & {} & {} & \texttlf{1} \\ \caption[Unidades medicinales]{Unidades medicinales (pág. 68)} \begin{tabular}{@{}lcrccccc@{}} \toprule +\multirow{2}{*}{Unidad} & \multicolumn{7}{c}{Subunidades} \\ +\cmidrule{2-8} {} & libras & onzas & dracmas & escrúpulos & óbolos & silicuas & granos \\ \midrule Libra boticaria & \texttlf{1} & \texttlf{12} & {} & {} & {} & {} & {} \\ |